From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 17 May 2016 23:31:59 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=db29a76ed9d85653c7c4cd44572d94438249fb3a;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/init.d/ntpd b/init.d/ntpd
index f89bdd3c..5bed5ce7 100755
--- a/init.d/ntpd
+++ b/init.d/ntpd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/init.d/sntp b/init.d/sntp
index b0261d9d..5b3b4632 100755
--- a/init.d/sntp
+++ b/init.d/sntp
@@ -1,15 +1,17 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+command="/usr/bin/sntp"
+
 depend() {
 	before cron portmap
 	after net
 	use dns logger
 }
 
-checkconfig() {
+start_pre() {
 	if [ -z "${SNTP_OPTS}" ] ; then
 		eerror "Please edit /etc/conf.d/sntp"
 		eerror "I need to know what server/options to use!"
@@ -19,9 +21,7 @@ checkconfig() {
 }
 
 start() {
-	checkconfig || return $?
-
 	ebegin "Setting clock via SNTP"
-	/usr/bin/sntp ${SNTP_OPTS}
+	${command} ${SNTP_OPTS}
 	eend $? "Failed to set clock"
 }