build default database

compiled/default/servicedirs/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
 

compiled/default/servicedirs/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

compiled/previous

@@ -0,0 +1 @@
+/etc/s6/compiled/default

init

@@ -79,7 +79,7 @@ background {
   s6-setsid --
   redirfd -w 1 /run/s6-run/service/s6-svscan-log/fifo
   fdmove -c 2 1
-  /etc/stage2
+  /etc/s6/stage2
 }
 
 unexport !

rc-serv-boot/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 {
+    forx -p third { shm pts }
-		if -n { mountpoint -q /dev/$third }
+    import -ui third
-		if { s6-mkdir -p -m 0755 /dev/$third }
+    if {
-		s6-envdir /etc/s6/env/mount/$third
+	    foreground {
-		import -ui fstype
+	        if -n { mountpoint -q /dev/$third }
-		import -ui device
+	        if { s6-mkdir -p -m 0755 /dev/$third }
-		import -ui mountpoint
+	        s6-envdir /etc/s6/env/mount/$third
-		import -ui options
+	        import -ui fstype
-		s6-mount -o $options -n -t $fstype $device $mountpoint
+	        import -ui device
-	}
+	        import -ui mountpoint
+	        import -ui options
+	        s6-mount -o $options -n -t $fstype $device $mountpoint
+	    }
+    }
 }
+s6-echo -- 00 successfully started

rc-serv-boot/boot-Rofs/contents

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

rc-serv-boot/boot-Rwfs/contents

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

rc-serv-boot/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

rc-serv-boot/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

rc-serv-boot/checkfs-fscheck/up

@@ -1,8 +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
+    fsck -A -T -a noopts=_netdev
 }
-s6-true
+wait { }
+s6-echo -- checkfs-fscheck successfully started

rc-serv-boot/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

rc-serv-boot/rofs-console/dependencies

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

rc-serv-boot/rofs-console/up

@@ -1,6 +1,8 @@
 #!/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
@@ -9,6 +11,9 @@ import -D "" FONT_UNIMAP
 foreground {
 	loadkeys -q -u $KEYMAP 
 }
-forx index { 0 1 2 3 4 5 6 7 8 9 10 }
+foreground {
-import -u index
+	forx index { 0 1 2 3 4 5 6 7 8 9 10 }
-setfont -m $FONT_MAP -u $FONT_UNIMAP $FONT -C /dev/tty${index}
+	import -u index
+	setfont -m $FONT_MAP -u $FONT_UNIMAP $FONT -C /dev/tty${index}
+}
+s6-echo -- rofs-console successfully started

rc-serv-boot/rofs-hardclock/dependencies

@@ -1 +1 @@
-
+00

rc-serv-boot/rofs-hardclock/up

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

rc-serv-boot/rofs-kernmod/up

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

rc-serv-boot/rofs-kernruntime/up

@@ -1,6 +1,7 @@
 #!/usr/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

rc-serv-boot/rofs-loopback/dependencies

@@ -1,2 +0,0 @@
-00
-rofs-Udevd

rc-serv-boot/rofs-loopback/up

@@ -1,4 +0,0 @@
-#!/usr/local/bin/execlineb -P
-
-fdmove -c 2 1
-ip link set up dev lo

rc-serv-boot/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

rc-serv-boot/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

rc-serv-boot/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

rc-serv-boot/rwfs-dmesglog/dependencies

@@ -1 +1 @@
-rwfs-fsrw
+rwfs-end

rc-serv-boot/rwfs-dmesglog/up

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

rc-serv-boot/rwfs-end/dependencies

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

rc-serv-boot/rwfs-end/type

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

rc-serv-boot/rwfs-fsrw/up

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

rc-serv-boot/rwfs-iptables/dependencies

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

rc-serv-boot/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

rc-serv-boot/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

rc-serv-boot/rwfs-localtime/up

@@ -1,6 +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
-s6-ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
+if { s6-ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime }
+s6-echo -- rwfs-localtime successfully started

rc-serv-boot/rwfs-loopback/dependencies

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

rc-serv-boot/rwfs-loopback/type

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

rc-serv-boot/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

rc-serv-boot/rwfs-nonetwork/up

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

rc-serv-boot/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

rc-serv-boot/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
 

rc-serv-boot/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

rc-serv-boot/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

s6-serv/enabled/all-User

@@ -1 +0,0 @@
-/etc/s6-serv/available/all-User

s6-serv/enabled/default/all-User/contents

@@ -0,0 +1,3 @@
+# NEVER ERASE this services below if you do not know what you are doing.
+boot-ready
+# Enter the desire services/bundle names below this lines.

s6-serv/enabled/default/all-User/type

@@ -0,0 +1 @@
+bundle

s6.conf

@@ -42,4 +42,16 @@ FONT=lat9w-16
 #FONT_UNIMAP= 
 
 #Modules, the list must be separate by space e.g. MODULES=vboxdrv i915 loop#
-#MODULES=
+MODULES=
+
+# Use Iptables [yes|no]
+# The configuration file in /etc/iptables/iptables.rules MUST exist
+IPTABLES=no
+
+# Use Iptables6 [yes|no]
+# The configuration file in /etc/iptables/ip6tables.rules MUST exist
+IP6TABLES=no
+
+# Force a check of disk/filesystem
+FORCECHCK=no
+

shutdown

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+usage() {
+    cat << EOF
+Usage: shutdown [OPTION]
+ -r, --reboot                  Reboot
+ -p, --poweroff                Poweroff
+EOF
+    exit 0
+}
+
+signal="${1}"
+if [ -z $signal ]; then
+    usage
+fi
+
+case "${signal}" in
+    -p|-P|--poweroff|-H|-h|--halt)
+        signal=SIGUSR2
+        ;;
+    -r|--reboot)
+        signal=SIGINT
+        ;;
+    *)
+       usage
+esac
+
+exec /run/s6-run/service/.s6-svscan/"${signal}"

stage3

@@ -36,6 +36,7 @@ foreground { s6-echo Syncing disks. }
 foreground { s6-sync }
 foreground { s6-echo Umount extra filesystem }
 foreground { umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs }
+foreground { rm -rf /tmp/* }
 foreground { s6-echo Remount ro / }
 foreground { mount -o remount,ro / }
 

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

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

svc-serv/service/.s6-svscan/SIGINT

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

svc-serv/service/.s6-svscan/SIGQUIT

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

svc-serv/service/.s6-svscan/SIGTERM

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

svc-serv/service/.s6-svscan/SIGUSR2

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

svc-serv/service/.s6-svscan/finish

@@ -6,4 +6,4 @@ fdmove -c 1 2
 foreground { s6-svc -X -- /run/s6-run/service/s6-svscan-log }
 unexport ?
 wait -r -- { }
-/etc/stage3 ${@}
+/etc/s6/stage3 ${@}