Cleanup service dependencies

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

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

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

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"

services/dhcpcd

@@ -1,6 +1,6 @@
 description "DHCP client on %0"
 type once
 target boot
-after dhcpcdmaster
+after dhcpcdmaster network
 
 exec dhcpcd -n %0

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

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

services/hwclock

@@ -3,4 +3,4 @@ exec hwclock --hctosys --utc
 type wait
 target boot
 before sysinit
-after vfs
+after vfs modules

services/ifcfg.in

@@ -2,5 +2,6 @@ description "static network configuration"
 type wait
 target boot
 after sysinit ifrename
+before network
 
 exec "@SCRIPTDIR@/ifcfg.sh"

services/ifrename.in

@@ -2,5 +2,6 @@ description "rename network interfaces"
 type wait
 target boot
 after sysinit
+before network
 
 exec "@SCRIPTDIR@/ifrename.sh"

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 +

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"

services/network

@@ -0,0 +1,4 @@
+description "static network configuration completed"
+type wait
+target boot
+after sysinit

services/sysctl

@@ -3,4 +3,4 @@ exec sysctl --system
 type wait
 target boot
 before sysinit
-after hwclock hostname vfs
+after vfs loopback

services/sysinit

@@ -1,3 +1,5 @@
 description basic system initialization
 type wait
 target boot
+after vfs
+before network

services/unbound

@@ -1,6 +1,6 @@
 description "Unbound resolver"
 type respawn limit 5
 target boot
-after sysinit ifcfg
+after network
 
 exec unbound -d

services/usyslogd

@@ -2,5 +2,5 @@ description "starting usyslogd"
 exec usyslogd
 type respawn limit 5
 target boot
-after hostname vfs
+after vfs
 before sysinit

services/vfs

@@ -1,3 +1,4 @@
 description VFS setup done
 type wait
 target boot
+before sysinit