Fix paths

Makefile

@@ -37,7 +37,6 @@ SERVICES = \
 	misc \
 	modules \
 	mount \
-	mount-all \
 	net-lo \
 	network \
 	pseudofs \
@@ -49,7 +48,6 @@ SERVICES = \
 	single \
 	swap \
 	sysctl \
-	sysusers \
 	tmpfiles-dev \
 	tmpfiles-setup \
 	tmpfs \
@@ -76,7 +74,8 @@ SCRIPTS = \
 	network \
 	pseudofs \
 	random-seed \
-	vconsole
+	vconsole \
+	root-rw
 
 TTY_SERVICES = \
 	tty1 \

scripts/root-rw

@@ -0,0 +1,3 @@
+#!/bin/sh
+mount -a
+mount -o remount,rw /

services/mount-all

@@ -1,5 +0,0 @@
-type         = scripted
-command      = /bin/mount -a -t nonfs,nonfs4,nosmbfs,nocifs,nocodafs,noncpfs,noshfs,nofuse,nofuseblk,noglusterfs,nodavfs,nofuse.glusterfs -O no_netdev
-restart      = false
-waits-for    = fsck
-waits-for.d  = mount.d

services/root-rw

@@ -1,9 +1,8 @@
 type    = scripted
-command = /bin/mount -o remount,rw /
+command = /etc/dinit.d/scripts/root-rw
 restart = false
 options = starts-rwfs
 logfile = /var/log/dinit/rootrw.log
 
-depends-on = mount-all
 waits-for  = hwclock
 waits-for  = fsck

services/setup

@@ -7,6 +7,5 @@ waits-for = net-lo
 waits-for = random-seed
 waits-for = swap
 waits-for = sysctl
-waits-for = sysusers
 waits-for = tmpfiles-setup
 waits-for = vconsole

services/swap

@@ -3,5 +3,4 @@ command      = /sbin/swapon -a
 stop-command = /sbin/swapoff -a
 depends-on   = root-rw
 depends-on   = udevd
-depends-on   = mount-all
 waits-for    = udev-settle

services/sysctl

@@ -1,4 +1,4 @@
 type      = scripted
-command   = /usr/bin/sysctl --system
+command   = /usr/sbin/sysctl --system
 restart   = false
 waits-for = pseudofs

services/sysusers

@@ -1,4 +0,0 @@
-type      = scripted
-command   = /usr/bin/sysusers
-restart   = false
-waits-for = root-rw

services/tmpfiles-dev

@@ -1,4 +1,4 @@
 type      = scripted
-command   = /bin/tmpfiles --prefix=/dev --create --boot
+command   = /bin/systemd-tmpfiles --prefix=/dev --create --boot
 restart   = false
 waits-for = kmod-static-nodes

services/tmpfiles-setup

@@ -1,4 +1,4 @@
 type      = scripted
-command   = /bin/tmpfiles --exclude-prefix=/dev --create --remove --boot
+command   = /bin/systemd-tmpfiles --exclude-prefix=/dev --create --remove --boot
 restart   = false
 waits-for = udev-settle