Bump 0.2.0

Makefile

@@ -1,6 +1,6 @@
 # Makefile for s6-boot
 
-VERSION = $(git describe --tags| sed 's/-.*//g;s/^v//;')
+VERSION = $$(git describe --tags| sed 's/-.*//g;s/^v//;')
 PKGNAME = s6-boot
 
 BINDIR_EXECLINE = /usr/local/bin

NEWS

@@ -1,18 +1,31 @@
 Changelog for s6-boot
 
-In 0.1.8
+In 0.2.0
+--------
 	
-	-- add data/scripts/modules.sh : the variable MODULES at s6.conf was
+	- Bugs fix
+	- Improve udevd and udevadm service
+	- Umount NFS4 system if exist on stage2.tini
+	
+In 0.1.9
+--------
+	
+	- Bugs fix
+	
+In 0.1.8
+--------
+
+	- add data/scripts/modules.sh : the variable MODULES at s6.conf was
 	removed. Modules are now loaded by this file with the rofs-modules 
 	oneshot service which run the scripts data/scripts/modules.sh. This 
 	scripts read, parse and load modules founded in files 
 	/usr/lib/modules-load.d, /run/modules-load.d, and /etc/modules-load.d
 	the last supersedes the previous one.
-	-- fix bug at rwfs-ip6tables at the shutdown process
-	-- add rwfs-tmpfiles services : the file founded at /usr/lib/tmpfiles.d
+	- fix bug at rwfs-ip6tables at the shutdown process
+	- add rwfs-tmpfiles services : the file founded at /usr/lib/tmpfiles.d
 	is now parsed and applied at boot time. Those files create sub-directories
 	at /run directories.
-	-- fix rwfs-end oneshot service
+	- fix rwfs-end oneshot service
 	
 In 0.1.7
 --------

compiled/default/servicedirs/udevd-udevadm/run

@@ -1,14 +0,0 @@
-#!/usr/local/bin/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
-# All rights reserved.
-# 
-# This file is part of Obarun. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/Obarun/s6-boot/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-fdmove -c 2 1
-if { s6-echo -- udevd-udevadm started }
-s6-devd 
-/usr/bin/udevadm settle

data/scripts/user.sh

@@ -188,7 +188,7 @@ enabled_daemon() {
 }
 
 start_database() {
-	log "init s6-rc database"
+	log "init s6-rc database with -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH}"
 	if [[ "${_UID}" == 0 ]]; then
 		s6-rc-init -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH}
 		s6-rc -v 3 -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -u change All
@@ -223,7 +223,7 @@ add() {
 	
 	enabled_daemon || exit 1
 	
-	s6_cmd "svscanctl" "an" "${DESTUSER}/${USER}/${DESTCLASSIC}" 2>/dev/null || exit 1
+	s6_cmd "svscanctl" "an" "${LIVE_CLASSIC_PATH}" 2>/dev/null || exit 1
 	
 	start_database || exit 1
 }

rc/rofs-Udevd/contents

@@ -1,3 +1,3 @@
 udevd-udev
-udevd-udevrules
 udevd-udevadm
+

rc/rofs-cgroups/down

@@ -19,4 +19,4 @@ foreground {
 	if { mountpoint -q /sys/fs/cgroup/${i} }
 	umount -R /sys/fs/cgroup/${i}
 }
-umount /sys/fs/cgroup
+umount -R /sys/fs/cgroup

rc/rwfs-ip6tables/down

@@ -16,6 +16,7 @@ importas -D "" IP6TABLES IP6TABLES
 ifelse -X { s6-test $IP6TABLES = yes }
 	{
 		if { s6-echo -- Flushing ip6tables }
-		/usr/lib/iptables/scripts/iptables-flush 6
+		foreground { /usr/lib/iptables/scripts/iptables-flush 6 }
+		s6-echo -- Ip6tables flushed
 	}
-s6-echo -- Ip6tables flushed
+s6-echo -- Ip6tables not actived

rc/udevd-udevadm/dependencies

@@ -1,2 +1,2 @@
 udevd-udev
-udevd-udevrules
+

rc/udevd-udevadm/run

@@ -1,14 +0,0 @@
-#!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
-# All rights reserved.
-# 
-# This file is part of Obarun. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/Obarun/s6-boot/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-fdmove -c 2 1
-if { s6-echo -- udevd-udevadm started }
-s6-devd 
-/usr/bin/udevadm settle

rc/udevd-udevadm/type

@@ -1 +1 @@
-longrun
+oneshot

rc/udevd-udevadm/up

@@ -10,8 +10,9 @@
 
 fdmove -c 2 1
 if { s6-echo -- udevd-udevrules started }
-foreground {
-	if { udevadm trigger --action=add --type=subsystems }
-	udevadm trigger --action=add --type=devices
+if {
+	foreground { udevadm trigger --action=add --type=subsystems }
+	foreground { udevadm trigger --action=add --type=devices }
+	udevadm settle
 }
 s6-echo -- udevd-udevrules successfully started

rc/udevd-udevrules/dependencies

@@ -1,2 +0,0 @@
-udevd-udev
-

rc/udevd-udevrules/type

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

stage2.tini

@@ -26,6 +26,12 @@ foreground {
 	if { s6-echo -- Cleaning /tmp directory }
 	rm -rf /tmp/ 
 }
+foreground {
+	if { s6-test -x /usr/bin/mountstats }
+	if -X { mountstats }
+	if { s6-echo Umount NFS filesystem }
+	umount -a -f -t nfs4 
+}
 
 if { s6-echo -- "***************************************************************************" }
 if { s6-echo -- "**                        Tini shutdown terminated                       **" }