add lvm features

README.md

@@ -1,3 +1,4 @@
 # s6-boot
 Boot files for s6
-UNDER DEVELOPMENT, DO NOT USE FOR PRODUCTION
+For instructions about S6 supervision suite : http://skarnet.org/software/
+Please see here http://obarun.org/forum/viewtopic.php?id=123 for futher informations about obarun use it.

_s6-svc

@@ -1,7 +1,7 @@
 #compdef s6-svc
 
 # completion for s6-svc
-# Eric Vidal <eric@obarun.org>
+# Copyright (C) 2015-2017 Eric Vidal <eric@obarun.org>
 # services in /run/s6/service. Change the path variable to suit your needs.
 
 path_dir_boot=/run/boot/service

boot-rc-serv/00/up

@@ -7,14 +7,14 @@ s6-envdir /etc/s6/env/s6-conf
 #if { s6-hostname $HOSTNAME }
 foreground {
 	forx -p first { proc sys dev run }
-	import -ui first
+	importas -ui -D "" first first
 	foreground { 
 		if -n { mountpoint -q /$first }
 		s6-envdir /etc/s6/env/mount/$first
-		import -ui fstype
-		import -ui device
-		import -ui mountpoint
-		import -ui options
+		importas -ui -D "" fstype fstype
+		importas -ui -D "" device device
+		importas -ui -D "" mountpoint mountpoint
+		importas -ui -D "" options options
 		s6-mount -o $options -t $fstype $device $mountpoint
 	}
 	
@@ -23,7 +23,7 @@ foreground {
 # create needed directory on run if doesn't exist
 if {
 	forx -p second { lvm user lock }
-	import -ui second
+	importas -ui -D "" second second
 	foreground {
 		if -n { s6-test -d /run/$second }
 		s6-mkdir -p -m 0755 /run/$second
@@ -33,16 +33,16 @@ if {
 # finaly mount /dev/shm /dev/pts 
 if {
     forx -p third { shm pts }
-    import -ui third
+    importas -ui -D "" third 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
+			importas -ui -D "" fstype fstype
+			importas -ui -D "" device device
+			importas -ui -D "" mountpoint mountpoint
+			importas -ui -D "" options options
 	        s6-mount -o $options -n -t $fstype $device $mountpoint
 	    }
     }

boot-rc-serv/boot-Rwfs/contents

@@ -1,4 +1,5 @@
 rwfs-fsrw
+rwfs-tmpdir
 rwfs-loopback
 rwfs-iptables
 rwfs-nonetwork

boot-rc-serv/checkfs-btrfs/up

@@ -3,7 +3,7 @@
 fdmove -c 2 1
 if { s6-echo -- checkfs-brtfs started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" USEBTRFS
+importas -D "" USEBTRFS USEBTRFS
 foreground {
 	if { s6-test $USEBTRFS = yes }
 	if { s6-test -x /usr/bin/btrfs }

boot-rc-serv/checkfs-dmraid/up

@@ -3,7 +3,7 @@
 fdmove -c 2 1
 if { s6-echo -- checkfs-dmraid started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" USEDMRAID
+importas -D "" USEDMRAID USEDMRAID
 foreground {
 	if { s6-test $USEDMRAID = yes }
 	if { s6-test -x /usr/bin/dmraid }

boot-rc-serv/checkfs-fscheck/dependencies

@@ -1,3 +1,4 @@
 rofs-Udevd
 checkfs-dmraid
 checkfs-btrfs
+checkfs-lvm

boot-rc-serv/checkfs-fscheck/up

@@ -2,20 +2,18 @@
 fdmove -c 2 1
 if { s6-echo -- checkfs-fsckeck started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" FORCECHCK
-if -t {
+importas -D "" FORCECHCK FORCECHCK
+foreground {
 	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
+	foreground { fsck -A -T -a -f noopts=_netdev }
+	s6-echo -- Filesystem checked
 }
+
 # 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
+    foreground { fsck -A -T -a noopts=_netdev }
 }
-wait { }
 s6-echo -- checkfs-fscheck successfully started

boot-rc-serv/checkfs-lvm/dependencies

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

boot-rc-serv/checkfs-lvm/type

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

boot-rc-serv/checkfs-lvm/up

@@ -0,0 +1,19 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+s6-envdir /etc/s6/env/s6-conf
+importas -D "" USELVM USELVM
+foreground {
+	if { s6-test $USELVM = yes }
+	if { s6-echo -- checkfs-lvm started }
+	foreground { 
+		if -nt { s6-test -d /run/lvm } 
+		s6-mkdir /run/lvm
+	}
+	if { /usr/bin/lvmetad -p /run/lvm/lvmetad.pid }
+	foreground {
+		if { /usr/bin/vgscan } 
+		/usr/bin/vgchange -ay
+	}
+	pkill lvmetad
+}
+s6-echo -- lvm-prepare successfully started

boot-rc-serv/rofs-Checkfs/contents

@@ -1,3 +1,4 @@
 checkfs-dmraid
 checkfs-btrfs
+checkfs-lvm
 checkfs-fscheck

boot-rc-serv/rofs-cgroups/down

@@ -7,7 +7,7 @@ foreground {
 	pipeline { s6-cut -d"\t" -f1 }
 	pipeline { s6-grep -vF -- devices }
 	forstdin -d"\n" -- i
-	import -u i
+	importas -u -D "" i i
 	if { mountpoint -q /sys/fs/cgroup/${i} }
 	umount -R /sys/fs/cgroup/${i}
 }

boot-rc-serv/rofs-cgroups/up

@@ -3,7 +3,7 @@
 fdmove -c 2 1
 if { s6-echo -- rofs-cgroups started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" CGROUPS
+importas -D "" CGROUPS CGROUPS
 foreground {
 	if { s6-test $CGROUPS = yes }
 	if { mkdir -p -m 0755 /sys/fs/cgroup }
@@ -13,7 +13,7 @@ foreground {
 	pipeline { s6-cut -d"\t" -f1 }
 	pipeline { s6-grep -vF -- devices }
 	forstdin -d"\n" -- i
-	import -u i
+	importas -u -D "" i i
 	if { s6-mkdir /sys/fs/cgroup/${i} }
 	s6-mount -t cgroup -o ${i} -- cgroup /sys/fs/cgroup/${i}
 }

boot-rc-serv/rofs-console/up

@@ -13,7 +13,7 @@ foreground {
 }
 foreground {
 	forx index { 0 1 2 3 4 5 6 7 8 9 10 }
-	import -u index
+	importas -u -D "" index 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

@@ -9,7 +9,7 @@ foreground {
 	pipeline -d { echo $HARDWARECLOCK }
 	pipeline { tr A-Z a-z } 
 	forstdin -- clock
-	import -iu clock
+	importas -iu -D "" clock clock
 	hwclock --systz --${clock} --noadjfile
 }
 s6-echo -- rofs-hardclock successfully started

boot-rc-serv/rofs-kernmod/up

@@ -8,7 +8,7 @@ foreground {
 	pipeline { s6-cut -d":" -f2 }
 	pipeline { s6-cut -d" " -f2 } 
 	forstdin -d"\n" -- mod 	
-	import -iu mod
+	importas -iu -D "" mod mod
 	modprobe $mod
 }
 s6-echo -- rofs-kermod successfully started

boot-rc-serv/rofs-kernruntime/up

@@ -3,7 +3,7 @@
 fdmove -c 2 1
 if { s6-echo -- rofs-kernruntime started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" KERNELRUNTIME
+importas -D "" KERNELRUNTIME KERNELRUNTIME
 foreground { 
 	if { s6-test $KERNELRUNTIME = yes }
 	if { s6-test -x /usr/bin/sysctl }

boot-rc-serv/rofs-modules/up

@@ -6,7 +6,7 @@ foreground {
 	if { s6-test -e /etc/s6/env/s6-conf/MODULES }
 	redirfd -r 0 /etc/s6/env/s6-conf/MODULES
 	forstdin -n -- mods
-	import -ui mods
+	importas -ui -D "" mods mods
 	foreground {
 		if { s6-test -n $mods }
 		modprobe -ab $mods

boot-rc-serv/rofs-swap/up

@@ -3,7 +3,7 @@
 fdmove -c 2 1
 if { s6-echo -- rofs-swap started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" USESWAP
+importas -D "" USESWAP USESWAP
 foreground {
 	if { s6-test $USESWAP = yes }
 	swapon -a

boot-rc-serv/rwfs-cleanboot/dependencies

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

boot-rc-serv/rwfs-cleanboot/up

@@ -2,12 +2,18 @@
 
 fdmove -c 2 1
 if { s6-echo -- rwfs-cleanboot started }
-if -t { install -m0664 -o root -g utmp /dev/null /run/utmp }
-
+if -t {
+    foreground { install -m0664 -o root -g utmp /dev/null /run/utmp }
+}
+if -t {
     if -nt { s6-test -e /var/log/wtmp }
-if -t { install -m0664 -o root -g utmp /dev/null /var/log/wtmp }
-	
+    foreground { install -m0664 -o root -g utmp /dev/null /var/log/wtmp }
+}
+if -t {
     if -nt { s6-test -e /var/log/btmp }
-if -t { install -m0600 -o root -g utmp /dev/null /var/log/btmp }
-if -t { install -dm1777 /tmp/.X11-unix /tmp/.ICE-unix }
+    foreground { install -m0600 -o root -g utmp /dev/null /var/log/btmp }
+}
+if -t {
+    foreground { install -dm1777 /tmp/.X11-unix /tmp/.ICE-unix }
+}
 s6-echo -- rwfs-cleanboot successfully started

boot-rc-serv/rwfs-iptables/dependencies

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

boot-rc-serv/rwfs-iptables/down

@@ -14,4 +14,4 @@ foreground {
 	if { s6-echo -- Flushing ip6tables }
 	/usr/lib/iptables/scripts/iptables-flush 6
 }
-s6-true
+s6-echo -- Iptables flushed

boot-rc-serv/rwfs-iptables/up

@@ -3,20 +3,20 @@
 fdmove -c 2 1
 if { s6-echo -- rwfs-iptables started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" IPTABLES
-import -D "" IP6TABLES
+importas -D "" IPTABLES IPTABLES
+importas -D "" IP6TABLES 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 }
+	foreground { 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
+	foreground { ip6tables-restore /etc/iptables/ip6tables.rules }
 	s6-echo -- Ip6tables actived
 }
 s6-echo -- rwfs-iptables successfully started

boot-rc-serv/rwfs-localtime/up

@@ -3,6 +3,6 @@
 fdmove -c 2 1
 if { s6-echo -- rwfs-localtime started }
 s6-envdir /etc/s6/env/s6-conf
-import -D "" TZ
+importas -D "" TZ TZ
 if { s6-ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime }
 s6-echo -- rwfs-localtime successfully started

boot-rc-serv/rwfs-loopback/dependencies

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

boot-rc-serv/rwfs-random/up

@@ -7,7 +7,7 @@ foreground {
 }
 
 backtick -n bytes { cat /proc/sys/kernel/random/poolsize }
-import -u bytes
+importas -u -D "" bytes bytes
 if -t {
 	foreground {
 		if { s6-test -z $bytes }
@@ -15,10 +15,8 @@ if -t {
 		umask 077
 		dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$defbytes 
 	}
-		true
+	s6-true
 }
-
 umask 077
-redirfd -w 1 /dev/null
-if { dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes }
+foreground { dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes }
 s6-echo -- rwfs-random successfully started

boot-rc-serv/rwfs-tmpdir/dependencies

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

boot-rc-serv/rwfs-tmpdir/type

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

boot-rc-serv/rwfs-tmpdir/up

@@ -0,0 +1,10 @@
+#!/usr/local/bin/execlineb -P
+fdmove -c 2 1
+if { s6-echo -- rwfs-tmpdir started }
+
+foreground {
+	if { s6-echo -- Create /tmp directory }
+	mkdir -p -m1777 /tmp
+}
+
+s6-echo -- rwfs-tmpdir successfully started

boot-rc-serv/switch-ready/up

@@ -3,5 +3,5 @@ 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
+importas -u -D "" serv serv
 s6-ln -s -- /etc/s6-serv/enabled/classic/${serv} /run/user/service

boot-rc-serv/udevd-udev/run

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

compiled/default/servicedirs/udevd-udev/run

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

init

@@ -1,5 +1,5 @@
 #!/usr/local/bin/execlineb -P
-# Copyright (C) 2015-2016 Eric Vidal <eric@obarun.org>
+# Copyright (C) 2015-2017 Eric Vidal <eric@obarun.org>
 #
 # This file is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -23,7 +23,7 @@ foreground {
     redirfd -r 0 /etc/s6/s6.conf
     pipeline { s6-grep -vF -- "#" }
     forstdin -nCd"\n" -- conf
-    importas -ui conf conf
+    importas -ui -D "" conf conf
     multidefine -d"=" $conf { var value }
     foreground {
 	    if { mkdir -p /run/s6-conf/ }
@@ -34,7 +34,7 @@ foreground {
 # load hostname for earlier tty
 foreground {
     s6-envdir /etc/s6/env/s6-conf
-    importas -i HOSTNAME HOSTNAME
+    importas -i -D "" HOSTNAME HOSTNAME
     s6-hostname ${HOSTNAME}
 }
 # Clean environment
@@ -49,15 +49,14 @@ umask 022
 if { 
 	if { s6-echo -- "***************************************************************************" }
 	if { s6-echo -- "**                        Booting Obarun under S6                        **" }
-	if { s6-echo -- "**                        Warning: Under development                     **" }
-	if { s6-echo -- "**                        http://obarun.org/                             **" }
+	if { s6-echo -- "**                        https://obarun.org/                            **" }
 	s6-echo -- "***************************************************************************"
 }
 
-# Copy service for pid1 in the right place
-importas -i boot-serv boot-serv
+# Copy service for pid1 at the right place
+importas -i -D "" BOOTSERV BOOTSERV
 foreground { 
-	if { s6-hiercopy ${boot-serv} /run/boot }
+	if { s6-hiercopy ${BOOTSERV} /run/boot }
 }
 
 redirfd -r 0 /dev/null

s6-serv/available/classic/README

@@ -1 +1 @@
-erase me
+delete this file

s6-serv/available/rc/README

@@ -1 +1 @@
-erase me
+delete this file

s6-serv/enabled/classic/README

@@ -1 +1 @@
-erase me
+delete this file

s6.conf

@@ -4,15 +4,15 @@
 # Apply kernel runtime [yes|no]
 KERNELRUNTIME=yes
 
-#boot with dmraid support [yes|no]
+# Boot with dmraid support [yes|no]
 USEDMRAID=no
 
-#boot with btrfs support [yes|no]
+# Boot with btrfs support [yes|no]
 USEBTRFS=no
 
-#boot with lvm support [yes|no]
-# This option is not available for the moment
-#USELVM=no
+# Boot with lvm support [yes|no]
+# Do not forget to remake your initramfs with lvm2 hook on it
+USELVM=no
 
 #swap support [yes|no]
 USESWAP=no
@@ -58,3 +58,5 @@ FORCECHCK=no
 # Use /etc/s6.local [yes|no]
 S6LOCAL=no
 
+# Remove entirely the /tmp directory
+TMPDIR=no

stage2

@@ -1,5 +1,5 @@
 #!/usr/local/bin/execlineb -P
-# Copyright (C) 2015-2016 Eric Vidal <eric@obarun.org>
+# Copyright (C) 2015-2017 Eric Vidal <eric@obarun.org>
 #
 # This file is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -25,4 +25,4 @@ if -nt {
 	s6-echo -- "***************************************************************************" 
 }
 redirfd -w 1 /dev/console
-s6-echo "Something wrong on stage2, log to debug it"
+s6-echo "Something wrong on stage2, please see the log at /run/boot/uncaught-logs/current to debug it"

stage2.tini

@@ -1,5 +1,5 @@
 #!/usr/local/bin/execlineb -S0
-# Copyright (C) 2015-2016 Eric Vidal <eric@obarun.org>
+# Copyright (C) 2015-2017 Eric Vidal <eric@obarun.org>
 #
 # This file is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -32,7 +32,6 @@ foreground {
 	umask 077
 	dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=$bytes
 }
-
 foreground {
 	s6-envdir /etc/s6/env/s6-conf
 	importas -u -D "" HARDWARECLOCK HARDWARECLOCK
@@ -42,6 +41,14 @@ foreground {
 	importas -iu clock clock
 	hwclock --systohc --${clock}
 }
+foreground {
+	s6-envdir /etc/s6/env/s6-conf
+	importas -u -D "" TMPDIR TMPDIR
+	if { s6-test $TMPDIR = yes }
+	if { s6-echo -- Cleaning /tmp directory }
+	rm -rf /tmp/ 
+}
+
 if { s6-echo -- "***************************************************************************" }
 if { s6-echo -- "**                        Tini shutdown terminated                       **" }
 if { s6-echo -- "**                            Enter on stage 3                           **" }

stage3

@@ -1,5 +1,5 @@
 #!/usr/local/bin/execlineb -S0
-# Copyright (C) 2015-2016 Eric Vidal <eric@obarun.org>
+# Copyright (C) 2015-2017 Eric Vidal <eric@obarun.org>
 #
 # This file is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -21,26 +21,25 @@ fdmove -c 2 1
 if { s6-echo -- "***************************************************************************" }
 if { s6-echo -- "**                        Start stage3                                   **" }
 if { s6-echo -- "***************************************************************************" }
-foreground { s6-echo Syncing disks. }
+foreground { s6-echo -- Syncing disks. }
 foreground { s6-sync }
 
-foreground { s6-echo Sending all processes the TERM signal. }
+foreground { s6-echo -- Sending all processes the TERM signal. }
 foreground { s6-nuke -th }
 foreground { s6-sleep 1 }
-foreground { s6-echo Sending all processes the KILL signal. }
+foreground { s6-echo -- Sending all processes the KILL signal. }
 foreground { s6-nuke -k }
 
 wait { }
 
 foreground { s6-echo Syncing disks. }
 foreground { s6-sync }
-foreground { s6-echo Umount extra filesystem }
+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 { s6-echo -- Remount ro / }
 foreground { mount -o remount,ro / }
 
-foreground { s6-echo Syncing disks. }
+foreground { s6-echo -- Syncing disks. }
 foreground { s6-sync }
 
 # Reboot, halt or poweroff the machine, depending on the parameter