aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2017-03-16 10:16:39 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2017-03-16 10:16:39 -0500
commit9bd63b5d4a16601712a65eb8962214cdd4d26ce5 (patch)
treec9bbba2e063e99aec0f8b3fb569c1c26277c04b7
parentupdate news file (diff)
downloadopenrc-9bd63b5d4a16601712a65eb8962214cdd4d26ce5.zip
openrc-9bd63b5d4a16601712a65eb8962214cdd4d26ce5.tar.gz
openrc-9bd63b5d4a16601712a65eb8962214cdd4d26ce5.tar.bz2
update dependencies for clock service
The clock services had a very long list of "before" dependencies that referred to other services within OpenRC. For ease of maintenance, convert these to "after clock" dependencies in the individual services.
-rw-r--r--init.d/adjkerntz.in1
-rw-r--r--init.d/binfmt.in2
-rw-r--r--init.d/devdb.in1
-rw-r--r--init.d/dumpon.in1
-rw-r--r--init.d/fsck.in1
-rw-r--r--init.d/hostid.in1
-rw-r--r--init.d/hostname.in1
-rw-r--r--init.d/hwclock.in3
-rw-r--r--init.d/keymaps.in2
-rw-r--r--init.d/localmount.in2
-rw-r--r--init.d/loopback.in1
-rw-r--r--init.d/mtab.in1
-rw-r--r--init.d/network.in2
-rw-r--r--init.d/newsyslog.in1
-rw-r--r--init.d/procfs.in1
-rw-r--r--init.d/root.in1
-rw-r--r--init.d/savecore.in1
-rw-r--r--init.d/staticroute.in4
-rw-r--r--init.d/swap-blk.in1
-rw-r--r--init.d/swap.in1
-rw-r--r--init.d/swclock.in4
-rw-r--r--init.d/syscons.in1
-rw-r--r--init.d/sysctl.in1
-rw-r--r--init.d/syslogd.in2
-rw-r--r--init.d/termencoding.in2
-rw-r--r--init.d/ttys.in2
-rw-r--r--init.d/urandom.in1
-rw-r--r--init.d/wscons.in1
28 files changed, 27 insertions, 16 deletions
diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in
index 7f8b007..ba373c1 100644
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -23,6 +23,7 @@ fi
depend()
{
+ after swclock
provide clock
# BSD adjkerntz needs to be able to write to /etc
if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||
diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 4afb83b..67120ea 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -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/devdb.in b/init.d/devdb.in
index 3fdf530..a6d3806 100644
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -13,6 +13,7 @@ description="Creates the dev database"
depend()
{
+ after clock
need localmount
}
diff --git a/init.d/dumpon.in b/init.d/dumpon.in
index 349276e..8a72e69 100644
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -12,6 +12,7 @@
description="Configures a specific kernel dump device."
depend() {
+ after clock
need swap
keyword -jail -prefix
}
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 7d12482..7052d80 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -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/hostid.in b/init.d/hostid.in
index ec6f697..107b7f5 100644
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -15,6 +15,7 @@ extra_commands="reset"
depend()
{
use root
+ after clock
before devd net
keyword -jail -prefix
}
diff --git a/init.d/hostname.in b/init.d/hostname.in
index 253d338..af01241 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -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.in b/init.d/hwclock.in
index 3bfcab1..0fce88f 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -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.in b/init.d/keymaps.in
index dbe054a..2cc8a39 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -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.in b/init.d/localmount.in
index 9920dc9..6785a0b 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -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.in b/init.d/loopback.in
index 706ea79..70faf2b 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -13,6 +13,7 @@ description="Configures the loopback interface."
depend()
{
+ after clock
keyword -jail -prefix -systemd-nspawn -vserver
}
diff --git a/init.d/mtab.in b/init.d/mtab.in
index 99eb90d..80ef275 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -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/network.in b/init.d/network.in
index de31695..56d3e7b 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -18,7 +18,7 @@ __nl="
depend()
{
need localmount
- after bootmisc
+ after bootmisc clock
if [ -n "$(interfaces)" ]; then
provide net
fi
diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in
index da1b0ab..bcfff86 100644
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -13,6 +13,7 @@ required_files="/etc/newsyslog.conf"
depend()
{
+ after clock
need localmount
keyword -prefix
}
diff --git a/init.d/procfs.in b/init.d/procfs.in
index 2abeb03..343b30d 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -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.in b/init.d/root.in
index ec22699..9d05344 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -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/savecore.in b/init.d/savecore.in
index 8640fe5..b568d5a 100644
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -14,6 +14,7 @@ description="Saves a kernel dump."
depend()
{
need dumpon localmount
+ after clock
before encswap
keyword -jail -prefix
}
diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index 85f9059..d970b51 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -1,4 +1,4 @@
-#!@SBINDIR@/openrc-run
+S#!@BINDIR@/openrc-run
# Copyright (c) 2009-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -14,9 +14,9 @@
description="Configures static routes."
__nl="
"
-
depend()
{
+ after clock
provide net
use network
keyword -jail -prefix -vserver
diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in
index 277cc88..415cfaf 100644
--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -11,6 +11,7 @@
depend()
{
+ after clock
before fsck
keyword -jail -prefix
}
diff --git a/init.d/swap.in b/init.d/swap.in
index 63087e8..546cb5f 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -11,6 +11,7 @@
depend()
{
+ after clock
before localmount
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
}
diff --git a/init.d/swclock.in b/init.d/swclock.in
index 67baaab..b5556eb 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -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/syscons.in b/init.d/syscons.in
index c915762..9fde54e 100644
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -10,6 +10,7 @@
# except according to the terms contained in the LICENSE file.
depend() {
+ after clock
need localmount
keyword -jail -prefix
}
diff --git a/init.d/sysctl.in b/init.d/sysctl.in
index cb756f3..ae9f17f 100644
--- a/init.d/sysctl.in
+++ b/init.d/sysctl.in
@@ -11,6 +11,7 @@
depend()
{
+ after clock
before bootmisc logger
keyword -prefix -systemd-nspawn -vserver
}
diff --git a/init.d/syslogd.in b/init.d/syslogd.in
index 7ddde9a..504b953 100644
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -22,6 +22,6 @@ depend()
provide logger
use net newsyslog
need localmount
- after bootmisc
+ after bootmisc clock
keyword -prefix
}
diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index 9f33eb6..86f5b58 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -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/ttys.in b/init.d/ttys.in
index db9a8f0..e32f3e6 100644
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -11,7 +11,7 @@
depend()
{
- after fsck
+ after clock fsck
keyword -prefix
}
diff --git a/init.d/urandom.in b/init.d/urandom.in
index 54706ac..91b54f3 100644
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -14,6 +14,7 @@ description="Initializes the random number generator."
depend()
{
+ after clock
need localmount
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
}
diff --git a/init.d/wscons.in b/init.d/wscons.in
index cf5aee9..1f4acf0 100644
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -11,6 +11,7 @@
depend()
{
+ after clock
need localmount
keyword -prefix
}