summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-07-18 21:33:25 +0200
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-07-18 21:33:25 +0200
commitf9d75896f43950eaaaf1201b98736f94ccb7164b (patch)
tree86de911edf8fe1804c003f65deafba381ce0661b
parent4b047ad61e53066e6c5d96f0f79ea3f194938c84 (diff)
Cleanup service dependencies
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
-rw-r--r--Makefile.am1
-rw-r--r--services/Makemodule.am3
-rw-r--r--services/agetty2
-rw-r--r--services/dhcpcd2
-rw-r--r--services/dhcpcdmaster2
-rw-r--r--services/dnsmasq2
-rw-r--r--services/hwclock2
-rw-r--r--services/ifcfg.in1
-rw-r--r--services/ifrename.in1
-rw-r--r--services/loopback2
-rw-r--r--services/modules.in2
-rw-r--r--services/network4
-rwxr-xr-xservices/sysctl2
-rw-r--r--services/sysinit2
-rw-r--r--services/unbound2
-rw-r--r--services/usyslogd2
-rw-r--r--services/vfs1
17 files changed, 22 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index e087a8c..3914c91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,7 @@ install-data-local:
$(LN_S) $(TEMPLATEDIR)/ifdown $(DESTDIR)$(SVCDIR)/ifdown@reboot
$(LN_S) $(TEMPLATEDIR)/ifcfg $(DESTDIR)$(SVCDIR)/ifcfg
$(LN_S) $(TEMPLATEDIR)/modules $(DESTDIR)$(SVCDIR)/modules
+ $(LN_S) $(TEMPLATEDIR)/network $(DESTDIR)$(SVCDIR)/network
if USYSLOGD
$(LN_S) $(TEMPLATEDIR)/usyslogd $(DESTDIR)$(SVCDIR)/usyslogd
endif
diff --git a/services/Makemodule.am b/services/Makemodule.am
index 4cad483..5ba6364 100644
--- a/services/Makemodule.am
+++ b/services/Makemodule.am
@@ -7,6 +7,7 @@ init_DATA += services/sysfs services/procfs services/tmpfs
init_DATA += services/vfs services/ifrename services/ifcfg
init_DATA += services/dhcpcd services/dhcpcdmaster services/unbound
init_DATA += services/dnsmasq services/ifdown services/modules
+init_DATA += services/network
if USYSLOGD
init_DATA += services/usyslogd
@@ -16,4 +17,4 @@ EXTRA_DIST += services/sysinit services/vfs services/agetty services/hostname
EXTRA_DIST += services/hwclock services/loopback services/reboot
EXTRA_DIST += services/shutdown services/sync services/sysctl services/tmpfs
EXTRA_DIST += services/dhcpcd services/dhcpcdmaster services/unbound
-EXTRA_DIST += services/usyslogd services/dnsmasq
+EXTRA_DIST += services/usyslogd services/dnsmasq services/network
diff --git a/services/agetty b/services/agetty
index b4dc70d..6c8945b 100644
--- a/services/agetty
+++ b/services/agetty
@@ -2,5 +2,5 @@ description agetty on %0
exec agetty %0 linux
type respawn
target boot
-after sysinit
+after network
tty "/dev/%0"
diff --git a/services/dhcpcd b/services/dhcpcd
index c08fac0..f597672 100644
--- a/services/dhcpcd
+++ b/services/dhcpcd
@@ -1,6 +1,6 @@
description "DHCP client on %0"
type once
target boot
-after dhcpcdmaster
+after dhcpcdmaster network
exec dhcpcd -n %0
diff --git a/services/dhcpcdmaster b/services/dhcpcdmaster
index 6d0fecd..276a2f8 100644
--- a/services/dhcpcdmaster
+++ b/services/dhcpcdmaster
@@ -1,7 +1,7 @@
description "DHCP client - master service"
type wait
target boot
-after sysinit ifrename ifcfg
+after network
exec {
mkdir -p /var/db/dhcpcd
diff --git a/services/dnsmasq b/services/dnsmasq
index c739e8b..4045824 100644
--- a/services/dnsmasq
+++ b/services/dnsmasq
@@ -1,6 +1,6 @@
description "dnsmasq DNS & DHCP server"
type respawn limit 5
target boot
-after sysinit ifcfg unbound
+after network unbound
exec dnsmasq -k
diff --git a/services/hwclock b/services/hwclock
index eeafe8b..7eac1da 100644
--- a/services/hwclock
+++ b/services/hwclock
@@ -3,4 +3,4 @@ exec hwclock --hctosys --utc
type wait
target boot
before sysinit
-after vfs
+after vfs modules
diff --git a/services/ifcfg.in b/services/ifcfg.in
index 940a289..c2b4127 100644
--- a/services/ifcfg.in
+++ b/services/ifcfg.in
@@ -2,5 +2,6 @@ description "static network configuration"
type wait
target boot
after sysinit ifrename
+before network
exec "@SCRIPTDIR@/ifcfg.sh" \ No newline at end of file
diff --git a/services/ifrename.in b/services/ifrename.in
index 7c6e346..efb00de 100644
--- a/services/ifrename.in
+++ b/services/ifrename.in
@@ -2,5 +2,6 @@ description "rename network interfaces"
type wait
target boot
after sysinit
+before network
exec "@SCRIPTDIR@/ifrename.sh" \ No newline at end of file
diff --git a/services/loopback b/services/loopback
index 5a77a6f..53118b5 100644
--- a/services/loopback
+++ b/services/loopback
@@ -2,7 +2,7 @@ description configure network loopback device
type wait
target boot
before sysinit
-after hwclock hostname vfs
+after hostname vfs
exec {
ip addr add 127.0.0.1/8 dev lo brd +
diff --git a/services/modules.in b/services/modules.in
index 3e0b69c..e8c1863 100644
--- a/services/modules.in
+++ b/services/modules.in
@@ -1,7 +1,7 @@
description "load kernel modules"
type wait
target boot
-after vfs
+after vfs usyslogd
before sysinit
exec "@SCRIPTDIR@/modules_load.sh" \ No newline at end of file
diff --git a/services/network b/services/network
new file mode 100644
index 0000000..5ba505c
--- /dev/null
+++ b/services/network
@@ -0,0 +1,4 @@
+description "static network configuration completed"
+type wait
+target boot
+after sysinit \ No newline at end of file
diff --git a/services/sysctl b/services/sysctl
index a5ee62b..0b30567 100755
--- a/services/sysctl
+++ b/services/sysctl
@@ -3,4 +3,4 @@ exec sysctl --system
type wait
target boot
before sysinit
-after hwclock hostname vfs
+after vfs loopback
diff --git a/services/sysinit b/services/sysinit
index 0429dfe..801ac97 100644
--- a/services/sysinit
+++ b/services/sysinit
@@ -1,3 +1,5 @@
description basic system initialization
type wait
target boot
+after vfs
+before network \ No newline at end of file
diff --git a/services/unbound b/services/unbound
index e6189f1..e9980ab 100644
--- a/services/unbound
+++ b/services/unbound
@@ -1,6 +1,6 @@
description "Unbound resolver"
type respawn limit 5
target boot
-after sysinit ifcfg
+after network
exec unbound -d
diff --git a/services/usyslogd b/services/usyslogd
index 23bea3b..dccce82 100644
--- a/services/usyslogd
+++ b/services/usyslogd
@@ -2,5 +2,5 @@ description "starting usyslogd"
exec usyslogd
type respawn limit 5
target boot
-after hostname vfs
+after vfs
before sysinit \ No newline at end of file
diff --git a/services/vfs b/services/vfs
index 471d8c1..b699976 100644
--- a/services/vfs
+++ b/services/vfs
@@ -1,3 +1,4 @@
description VFS setup done
type wait
target boot
+before sysinit \ No newline at end of file