saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/ntp-client b/init.d/ntp-client
index 451bb3ec7c152dac0fa1c0b5e3995e7ac72a8a76..93375b4a3b241ed6a24dd0919f16e82b01948852 100755 (executable)
--- a/init.d/ntp-client
+++ b/init.d/ntp-client
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/init.d/ntpd b/init.d/ntpd
index f89bdd3c9354643a6018f12e52ec15c679ec8d10..5bed5ce757c00bb815cd97e0b82d8ed89a454c2d 100755 (executable)
--- 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 b0261d9d57dc32b4b26ba76a64cc92295d12f657..5b3b4632bfb93253a4510ce00b7477e7bcb3d1c5 100755 (executable)
--- 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"
 }