From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 29 May 2017 11:22:04 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4cefe825f40a4f313b2bed62f01474afda7401f9;p=config%2Fbruni%2Fetc.git

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

diff --git a/init.d/agetty b/init.d/agetty
index c45459e8..bad02184 100755
--- 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 e3b1a33b..8b8b19ff 100755
--- 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 f14793db..b42c14f5 100755
--- 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 fc892c03..d4b8da77 100755
--- 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 474d75af..81969f8b 100755
--- 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 ebe821b6..944b6aae 100755
--- 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 49e41b0e..149428a1 100755
--- 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 7b9271ff..30a11731 100755
--- 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 fa7ea03b..35f69a3f 100755
--- 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 3badeace..5bc0e13f 100755
--- 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/procfs b/init.d/procfs
index 91be45a5..cd518749 100755
--- 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 36437a04..19e6c734 100755
--- 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 0b0de870..5de405bd 100755
--- 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 2a93d1fa..9ce6c383 100755
--- 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 c27248d5..34073b04 100755
--- 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 b238d8d8..687b3f7f 100755
--- 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 499feea5..c1a88836 100755
--- 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
 }