saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/agetty b/init.d/agetty
index c45459e8cd5fa5746b9d9504c98c2718b8d4c01d..bad02184b202865edfddab2bd9442e759f9e7a06 100755 (executable)
--- a/init.d/agetty
+++ b/init.d/agetty
@@ -19,6 +19,7 @@ pidfile="/run/${RC_SVCNAME}.pid"
 
 depend() {
        after local
+       keyword -prefix
 }
 
 start_pre() {

diff --git a/init.d/binfmt b/init.d/binfmt
index e3b1a33b4eac9f7d11437aa818d9b33d2cf2bc71..8b8b19ff53d7d1bc1c71b344b5c4c5e2b732ef74 100755 (executable)
--- a/init.d/binfmt
+++ b/init.d/binfmt
@@ -13,7 +13,7 @@ description="Register misc binary format handlers"
 
 depend()
 {
-       after procfs
+       after clock procfs
        use modules devfs
        keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/bootmisc b/init.d/bootmisc
index f14793dbeaed4e344058f091148e6d5b733766b5..b42c14f51412dd74dd7f67352e0c5645042a936d 100755 (executable)
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -71,7 +71,8 @@ cleanup_var_run_dir()
        ebegin "Cleaning /var/run"
        for x in $(find /var/run ! -type d ! -name utmp \
                ! -name random-seed ! -name dev.db \
-               ! -name ld-elf.so.hints ! -name ld.so.hints);
+               ! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
+               ! -name ld.so.hints);
        do
                # Clean stale sockets
                if [ -S "$x" ]; then

diff --git a/init.d/fsck b/init.d/fsck
index fc892c03176534e0a5e1d15a1a3419d4de427580..d4b8da77a1be2f56c2b0b4105f66e4d4fa71e4ab 100755 (executable)
--- a/init.d/fsck
+++ b/init.d/fsck
@@ -15,6 +15,7 @@ _IFS="
 
 depend()
 {
+       after clock
        use dev clock modules
        keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }

diff --git a/init.d/hostname b/init.d/hostname
index 474d75affce34afa92fef5cecf6830f9f7615e1d..81969f8bdb35f505bb3b5d8ff080c0f57a904a1a 100755 (executable)
--- a/init.d/hostname
+++ b/init.d/hostname
@@ -12,6 +12,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
+       after clock
        keyword -docker -lxc -prefix -systemd-nspawn
 }
 

diff --git a/init.d/hwclock b/init.d/hwclock
index ebe821b6983fb58cef0ab7b62c3a9236fb643735..944b6aae98b9b64eead31ebc1b235b38d30b0cf6 100755 (executable)
--- a/init.d/hwclock
+++ b/init.d/hwclock
@@ -33,9 +33,6 @@ depend()
        want modules
        if yesno $clock_adjfile; then
                use root
-       else
-               before binfmt bootmisc fsck hostname keymaps localmount loopback mtab
-               before procfs root swap sysctl termencoding urandom
        fi
        keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

diff --git a/init.d/keymaps b/init.d/keymaps
index 49e41b0e7c5af2ae9b8c70fb570a9ad1a30ea095..149428a13cccd20c4198484cfdbab3034140d19b 100755 (executable)
--- a/init.d/keymaps
+++ b/init.d/keymaps
@@ -14,7 +14,7 @@ description="Applies a keymap for the consoles."
 depend()
 {
        need localmount termencoding
-       after bootmisc
+       after bootmisc clock
        keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 

diff --git a/init.d/localmount b/init.d/localmount
index 7b9271ffe45082fd0b8dc2fa21ece1d46326cc73..30a117317d93b99defe992db5802522d56c08868 100755 (executable)
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -15,7 +15,7 @@ depend()
 {
        need fsck
        use lvm modules mtab root
-       after lvm modules root
+       after clock lvm modules root
        keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

diff --git a/init.d/loopback b/init.d/loopback
index fa7ea03bd7895aae065371a7b8bde8e95c51c59c..35f69a3f49506ae580b6d1fc4415709c7f4bdc8c 100755 (executable)
--- a/init.d/loopback
+++ b/init.d/loopback
@@ -13,6 +13,7 @@ description="Configures the loopback interface."
 
 depend()
 {
+       after clock
        keyword -jail -prefix -systemd-nspawn -vserver
 }
 

diff --git a/init.d/mount-ro b/init.d/mount-ro
index 3badeace7c94fef7b99297b21ecd12e348464921..5bc0e13f7480a88c925a596bddc55d4eabc21c90 100755 (executable)
--- a/init.d/mount-ro
+++ b/init.d/mount-ro
@@ -13,7 +13,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
-       need killprocs savecache
+       after killprocs savecache
        keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 

diff --git a/init.d/mtab b/init.d/mtab
index 9b17525c0c48b7dc477dc47db786af68d2b7d17a..9035232daf14b6c6fd8c9562575e0c93eb8ac02e 100755 (executable)
--- a/init.d/mtab
+++ b/init.d/mtab
@@ -13,6 +13,7 @@ description="Update /etc/mtab to match what the kernel knows about"
 
 depend()
 {
+       after clock
        need root
        keyword -prefix -systemd-nspawn
 }

diff --git a/init.d/procfs b/init.d/procfs
index 91be45a5a9506a61782f3866310f01440508d8bf..cd518749cac1a8095f18f966f0bab37d4eec9cc4 100755 (executable)
--- a/init.d/procfs
+++ b/init.d/procfs
@@ -13,6 +13,7 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
+       after clock
        use devfs
        want modules
        need localmount

diff --git a/init.d/root b/init.d/root
index 36437a044e1664133cde4bfa8291a0ab5a545499..19e6c7346d50e10e8259bda4db24cce3fef62b32 100755 (executable)
--- a/init.d/root
+++ b/init.d/root
@@ -13,6 +13,7 @@ description="Mount the root fs read/write"
 
 depend()
 {
+       after clock
        need fsck
        keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/swap b/init.d/swap
index 0b0de87069d4930ea534dfae865a3cde720c68eb..5de405bd46e7f2b94e615edb1d0c4d065c3dec59 100755 (executable)
--- a/init.d/swap
+++ b/init.d/swap
@@ -11,6 +11,7 @@
 
 depend()
 {
+       after clock
        before localmount
        keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/swclock b/init.d/swclock
index 2a93d1faadaa8e65a361a314c510cc40d131346c..9ce6c3838bd8c83b984824c3d833cb48d60ff2ae 100755 (executable)
--- a/init.d/swclock
+++ b/init.d/swclock
@@ -13,10 +13,6 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-       before adjkerntz binfmt bootmisc devdb dumpon fsck hostid hostname keymaps
-       before localmount loopback modules mtab network newsyslog procfs root
-       before savecore staticroute swap swap-blk syscons sysctl syslogd
-       before termencoding ttys urandom wscons
        provide clock
        keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

diff --git a/init.d/sysctl b/init.d/sysctl
index c27248d565368d8bd4b075e04a56dd0618b23df6..34073b041b3ce73154334fb8cc6a4f92795caef4 100755 (executable)
--- a/init.d/sysctl
+++ b/init.d/sysctl
@@ -11,6 +11,7 @@
 
 depend()
 {
+       after clock
        before bootmisc logger
        keyword -prefix -systemd-nspawn -vserver
 }

diff --git a/init.d/termencoding b/init.d/termencoding
index b238d8d80940b7dcf77bbff56a4dbda1c631f2bb..687b3f7fd8c5659bd5b57bea1f0ed2e20bf095ac 100755 (executable)
--- a/init.d/termencoding
+++ b/init.d/termencoding
@@ -18,7 +18,7 @@ depend()
 {
        keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
        use root
-       after bootmisc
+       after bootmisc clock
 }
 
 start()

diff --git a/init.d/urandom b/init.d/urandom
index 499feea514965d72303acfb10a3d484326c7f369..c1a88836dd49214d07b76d9cd1f2190a05486ce1 100755 (executable)
--- a/init.d/urandom
+++ b/init.d/urandom
@@ -14,6 +14,7 @@ description="Initializes the random number generator."
 
 depend()
 {
+       after clock
        need localmount
        keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }