ooops

_s6-svc

@@ -4,14 +4,16 @@
 # Eric Vidal <eric@obarun.org>
 # services in /run/s6/service. Change the path variable to suit your needs.
 
-path_dir=/run/s6/service
+path_dir_boot=/run/boot/service
+path_dir_user=/run/user/service
 
 typeset -A opt_args
 
 _path() {
 	local list_dir
-	list_dir=( $path_dir/* )
-	compadd "$@" -a list_dir 
+	list_dir_boot=( $path_dir_boot/* )
+	list_dir_user=( $path_dir_user/* )
+	compadd "$@" -a list_dir_boot list_dir_user
 }
 
 _list_common=(

boot-rc-serv/00/up

@@ -1,5 +1,6 @@
 #!/usr/local/bin/execlineb -P
 fdmove -c 2 1
+if { s6-echo -- 00 started }
 s6-envdir /etc/s6/env/s6-conf
 # mount proc sys dev run if doesn't exist
 #import -i HOSTNAME
@@ -30,17 +31,20 @@ if {
 } 
 
 # finaly mount /dev/shm /dev/pts 
-forx -p third { shm pts }
-import -ui third
 if {
-	foreground {
-		if -n { mountpoint -q /dev/$third }
-		if { s6-mkdir -p -m 0755 /dev/$third }
-		s6-envdir /etc/s6/env/mount/$third
-		import -ui fstype
-		import -ui device
-		import -ui mountpoint
-		import -ui options
-		s6-mount -o $options -n -t $fstype $device $mountpoint
-	}
+    forx -p third { shm pts }
+    import -ui third
+    if {
+	    foreground {
+	        if -n { mountpoint -q /dev/$third }
+	        if { s6-mkdir -p -m 0755 /dev/$third }
+	        s6-envdir /etc/s6/env/mount/$third
+	        import -ui fstype
+	        import -ui device
+	        import -ui mountpoint
+	        import -ui options
+	        s6-mount -o $options -n -t $fstype $device $mountpoint
+	    }
+    }
 }
+s6-echo -- 00 successfully started

boot-rc-serv/All/contents

@@ -0,0 +1,3 @@
+all-Boot
+#all-User
+all-Switch

boot-rc-serv/all-Switch/contents

@@ -0,0 +1,3 @@
+switch-ready
+switch-svscan
+switch-user

boot-rc-serv/boot-Rofs/contents

@@ -7,6 +7,5 @@ rofs-Udevd
 rofs-Checkfs
 rofs-modules
 rofs-swap
-rofs-loopback
 rofs-kernruntime
 

boot-rc-serv/boot-Rwfs/contents

@@ -0,0 +1,10 @@
+rwfs-fsrw
+rwfs-loopback
+rwfs-iptables
+rwfs-nonetwork
+rwfs-localtime
+rwfs-random
+rwfs-cleanboot
+rwfs-end
+rwfs-dmesglog
+rwfs-s6local

boot-rc-serv/checkfs-btrfs/up

@@ -1,6 +1,7 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- checkfs-brtfs started }
 s6-envdir /etc/s6/env/s6-conf
 import -D "" USEBTRFS
 foreground {
@@ -8,4 +9,4 @@ foreground {
 	if { s6-test -x /usr/bin/btrfs }
 	btrfs device scan
 }
-true
+s6-echo -- checkfs-brtfs successfully started

boot-rc-serv/checkfs-dmraid/up

@@ -1,6 +1,7 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- checkfs-dmraid started }
 s6-envdir /etc/s6/env/s6-conf
 import -D "" USEDMRAID
 foreground {
@@ -8,4 +9,4 @@ foreground {
 	if { s6-test -x /usr/bin/dmraid }
 	dmraid -i -ay
 }
-true
+s6-echo -- checkfs-dmraid successfully started

boot-rc-serv/checkfs-fscheck/up

@@ -0,0 +1,21 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+if { s6-echo -- checkfs-fsckeck started }
+s6-envdir /etc/s6/env/s6-conf
+import -D "" FORCECHCK
+if -t {
+	if { s6-test $FORCECHCK = yes }
+	redirfd -w 1 /dev/console
+	if { s6-echo -- Check of filesystem was asked, please wait }
+	if { fsck -A -T -a -f noopts=_netdev }
+	if { s6-echo -- Filesystem checked }
+	redirfd -w 1 /run/s6/service/s6-svscan-log/fifo
+	s6-true
+}
+# if partition is checked, fsck return a fail exit
+# and a crash occurs, so whatever happens with fsck, the output need to be a success
+if -t {
+    fsck -A -T -a noopts=_netdev
+}
+wait { }
+s6-echo -- checkfs-fscheck successfully started

boot-rc-serv/rofs-cgroups/up

@@ -1,6 +1,7 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- rofs-cgroups started }
 s6-envdir /etc/s6/env/s6-conf
 import -D "" CGROUPS
 foreground {
@@ -16,4 +17,4 @@ foreground {
 	if { s6-mkdir /sys/fs/cgroup/${i} }
 	s6-mount -t cgroup -o ${i} -- cgroup /sys/fs/cgroup/${i}
 }
-true
+s6-echo -- rofs-cgroups successfully started

boot-rc-serv/rofs-console/dependencies

@@ -1 +1,2 @@
 rofs-kernmod
+rofs-Udevd

boot-rc-serv/rofs-console/up

@@ -0,0 +1,19 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rofs-console started }
+
+s6-envdir /etc/s6/env/s6-conf
+import -D "" KEYMAP 
+import -D "" FONT
+import -D "" FONT_MAP
+import -D "" FONT_UNIMAP
+foreground {
+	loadkeys -q -u $KEYMAP 
+}
+foreground {
+	forx index { 0 1 2 3 4 5 6 7 8 9 10 }
+	import -u index
+	setfont -m $FONT_MAP -u $FONT_UNIMAP $FONT -C /dev/tty${index}
+}
+s6-echo -- rofs-console successfully started

boot-rc-serv/rofs-hardclock/up

@@ -0,0 +1,15 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rofs-hardclock started }
+foreground {
+	s6-envdir /etc/s6/env/s6-conf
+	import -D "" TZ
+	import -D "" HARDWARECLOCK
+	pipeline -d { echo $HARDWARECLOCK }
+	pipeline { tr A-Z a-z } 
+	forstdin -- clock
+	import -iu clock
+	hwclock --systz --${clock} --noadjfile
+}
+s6-echo -- rofs-hardclock successfully started

boot-rc-serv/rofs-kernmod/up

@@ -0,0 +1,14 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rofs-kermod started }
+foreground {
+	pipeline -d { kmod static-nodes }
+	pipeline { s6-grep -F -- Module: }
+	pipeline { s6-cut -d":" -f2 }
+	pipeline { s6-cut -d" " -f2 } 
+	forstdin -d"\n" -- mod 	
+	import -iu mod
+	modprobe $mod
+}
+s6-echo -- rofs-kermod successfully started

boot-rc-serv/rofs-kernruntime/up

@@ -1,6 +1,7 @@
-#!/usr/bin/execlineb -P
+#!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- rofs-kernruntime started }
 s6-envdir /etc/s6/env/s6-conf
 import -D "" KERNELRUNTIME
 foreground { 
@@ -9,4 +10,4 @@ foreground {
 	if { s6-test -e /etc/sysctl.conf }
 	sysctl -p /etc/sysctl.conf
 }
-true
+s6-echo -- rofs-kernruntime successfully started

boot-rc-serv/rofs-modules/up

@@ -1,6 +1,7 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- rofs-modules started }
 foreground {
 	if { s6-test -e /etc/s6/env/s6-conf/MODULES }
 	redirfd -r 0 /etc/s6/env/s6-conf/MODULES
@@ -11,4 +12,4 @@ foreground {
 		modprobe -ab $mods
 	}
 }
-true
+s6-echo -- rofs-modules successfully started

boot-rc-serv/rofs-swap/up

@@ -1,10 +1,11 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- rofs-swap started }
 s6-envdir /etc/s6/env/s6-conf
 import -D "" USESWAP
 foreground {
 	if { s6-test $USESWAP = yes }
 	swapon -a
 }
-true
+s6-echo -- rofs-swap successfully started

boot-rc-serv/rwfs-cleanboot/up

@@ -1,6 +1,7 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
+if { s6-echo -- rwfs-cleanboot started }
 if -t { install -m0664 -o root -g utmp /dev/null /run/utmp }
 
 if -nt { s6-test -e /var/log/wtmp }
@@ -8,4 +9,5 @@ if -t { install -m0664 -o root -g utmp /dev/null /var/log/wtmp }
 	
 if -nt { s6-test -e /var/log/btmp }
 if -t { install -m0600 -o root -g utmp /dev/null /var/log/btmp }
-install -dm1777 /tmp/.X11-unix /tmp/.ICE-unix
+if -t { install -dm1777 /tmp/.X11-unix /tmp/.ICE-unix }
+s6-echo -- rwfs-cleanboot successfully started

boot-rc-serv/rwfs-dmesglog/dependencies

@@ -0,0 +1 @@
+rwfs-end

boot-rc-serv/rwfs-dmesglog/up

@@ -0,0 +1,8 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+if { s6-echo -- rwfs-dmesglog started }
+foreground {
+	redirfd -w 1 /var/log/dmesg.log
+	dmesg
+}
+s6-echo -- rwfs-dmesglog successfully started

boot-rc-serv/rwfs-end/dependencies

@@ -1,6 +1,7 @@
 rwfs-fsrw
+rwfs-loopback
+rwfs-iptables
 rwfs-nonetwork
 rwfs-localtime
 rwfs-random
 rwfs-cleanboot
-rwfs-dmesglog

boot-rc-serv/rwfs-fsrw/up

@@ -0,0 +1,5 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+if { s6-echo -- rwfs-fsrw started }
+if { s6-mount -o remount,rw / / }
+s6-echo -- rwfs-fsrw successfully started

boot-rc-serv/rwfs-iptables/dependencies

@@ -0,0 +1,2 @@
+rwfs-fsrw
+rwfs-loopback

boot-rc-serv/rwfs-iptables/down

@@ -0,0 +1,17 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+s6-envdir /etc/s6/env/s6-conf
+import -D "" IPTABLES
+import -D "" IP6TABLES
+foreground {
+	if { s6-test $IPTABLES = yes }
+	if { s6-echo -- Flushing iptables }
+	/usr/lib/iptables/scripts/iptables-flush
+
+}
+foreground {
+	if { s6-test $IP6TABLES = yes }
+	if { s6-echo -- Flushing ip6tables }
+	/usr/lib/iptables/scripts/iptables-flush 6
+}
+s6-true

boot-rc-serv/rwfs-iptables/up

@@ -0,0 +1,22 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rwfs-iptables started }
+s6-envdir /etc/s6/env/s6-conf
+import -D "" IPTABLES
+import -D "" IP6TABLES
+foreground {
+	if { s6-test $IPTABLES = yes }
+	if { s6-test -e /etc/iptables/iptables.rules }
+	if { s6-echo -- Activing iptables }
+	if { iptables-restore /etc/iptables/iptables.rules }
+	s6-echo -- Iptables actived
+}
+foreground {
+	if { s6-test $IP6TABLES = yes }
+	if { s6-test -e /etc/iptables/ip6tables.rules }
+	if { s6-echo -- Activing ip6tables }
+	ip6tables-restore /etc/iptables/ip6tables.rules
+	s6-echo -- Ip6tables actived
+}
+s6-echo -- rwfs-iptables successfully started

boot-rc-serv/rwfs-localtime/up

@@ -0,0 +1,8 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rwfs-localtime started }
+s6-envdir /etc/s6/env/s6-conf
+import -D "" TZ
+if { s6-ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime }
+s6-echo -- rwfs-localtime successfully started

boot-rc-serv/rwfs-loopback/up

@@ -0,0 +1,6 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rwfs-loopback started }
+if { ip link set up dev lo }
+s6-echo -- rwfs-loopback successfully started

boot-rc-serv/rwfs-nonetwork/up

@@ -0,0 +1,6 @@
+#!/usr/local/bin/execlineb -P
+
+fdmove -c 2 1
+if { s6-echo -- rwfs-nonetwork started }
+if { mount -a -t "nosysfs,nonfs,nonfs4,nosmbfs,nocifs" -O no_netdev }
+s6-echo -- rwfs-nonetwork successfully started

boot-rc-serv/rwfs-random/dependencies

@@ -1 +1,2 @@
 rwfs-fsrw
+

boot-rc-serv/rwfs-random/up

@@ -1,7 +1,7 @@
 #!/usr/local/bin/execlineb -P
 
 fdmove -c 2 1
-
+if { s6-echo -- rwfs-random started }
 foreground {
 	cp /var/lib/random-seed /dev/urandom
 }
@@ -20,4 +20,5 @@ if -t {
 
 umask 077 
 redirfd -w 1 /dev/null
-dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes
+if { dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes }
+s6-echo -- rwfs-random successfully started

boot-rc-serv/rwfs-s6local/dependencies

@@ -0,0 +1 @@
+rwfs-dmesglog

boot-rc-serv/rwfs-s6local/type

@@ -0,0 +1 @@
+oneshot

boot-rc-serv/rwfs-s6local/up

@@ -0,0 +1,7 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+s6-envdir /etc/s6/env/s6-conf
+importas -D "" S6LOCAL S6LOCAL
+ifelse -X { s6-test $S6LOCAL = yes }
+{ exec -c /etc/s6/data/scripts/s6.local }
+s6-echo -- s6.local desactived

boot-rc-serv/switch-ready/dependencies

@@ -0,0 +1 @@
+all-Boot

boot-rc-serv/switch-ready/type

@@ -0,0 +1 @@
+oneshot

boot-rc-serv/switch-ready/up

@@ -0,0 +1,7 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+if { s6-echo -- start switch-presvscan }
+if { s6-mkdir -p -m 0755 /run/user/service }
+forbacktickx -p -0 serv { s6-ls -0 /etc/s6-serv/enabled/classic }
+importas -u serv serv
+s6-ln -s -- /etc/s6-serv/enabled/classic/${serv} /run/user/service

boot-rc-serv/switch-svscan/dependencies

@@ -0,0 +1 @@
+switch-ready

boot-rc-serv/switch-svscan/run

@@ -1,4 +1,3 @@
 #!/usr/local/bin/execlineb -P
-
 fdmove -c 2 1
-ip link set up dev lo
+s6-svscan -t0 /run/user/service

boot-rc-serv/switch-user/dependencies

@@ -0,0 +1,2 @@
+switch-ready
+switch-svscan

boot-rc-serv/switch-user/down

@@ -0,0 +1,2 @@
+#!/usr/local/bin/execlineb -P
+s6-rc -l /run/user-rc -da change

boot-rc-serv/switch-user/type

@@ -0,0 +1 @@
+oneshot

boot-rc-serv/switch-user/up

@@ -0,0 +1,6 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+if { s6-echo -- switch-user started }
+if { s6-rc-init -c /etc/s6-serv/enabled/rc/compiled/current -l /run/user-rc /run/user/service }
+if { s6-rc -l /run/user-rc -u change All }
+s6-echo -- switch-user successfully started 

boot-rc-serv/udevd-udev/run

@@ -1,5 +1,6 @@
 #!/usr/local/bin/execlineb -P
 fdmove -c 2 1
+if { s6-echo -- udevd-udev started }
 exec -c
 udevd
 

boot-rc-serv/udevd-udevadm/run

@@ -1,4 +1,5 @@
 #!/usr/local/bin/execlineb -P
-#fdmove -c 2 1
+fdmove -c 2 1
+if { s6-echo -- udevd-udevadm started }
 s6-devd 
 /usr/bin/udevadm settle

boot-rc-serv/udevd-udevadm/type

@@ -0,0 +1 @@
+longrun

boot-rc-serv/udevd-udevrules/type

@@ -0,0 +1 @@
+oneshot

boot-rc-serv/udevd-udevrules/up

@@ -1,6 +1,8 @@
 #!/usr/local/bin/execlineb -P
 fdmove -c 2 1
+if { s6-echo -- udevd-udevrules started }
 foreground {
 	if { udevadm trigger --action=add --type=subsystems }
 	udevadm trigger --action=add --type=devices
 }
+s6-echo -- udevd-udevrules successfully started

boot-serv/service/.s6-svscan/SIGHUP

@@ -0,0 +1,4 @@
+#!/usr/local/bin/execlineb -P
+
+foreground { /etc/s6/stage2.tini }
+s6-svscanctl -h -- /run/boot/service