bump 0.2.1

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 All rights reserved.
 
 Permission to use, copy, modify, and/or distribute this software for any

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
@@ -56,7 +56,7 @@ install:
 	
 	install -m755 data/scripts/s6.local $(DESTDIR)/etc/s6/data/scripts/s6.local
 	ln -sf /etc/s6/data/scripts/s6.local $(DESTDIR)/etc/s6.local
-	install -m755 data/scripts/user.sh $(DESTDIR)/etc/s6/data/scripts/user.sh
+	install -m755 data/scripts/master.sh $(DESTDIR)/etc/s6/data/scripts/master.sh
 	install -m755 data/scripts/modules.sh $(DESTDIR)/etc/s6/data/scripts/modules.sh
 	install -m755 data/scripts/tmpfiles.sh $(DESTDIR)/etc/s6/data/scripts/tmpfiles.sh
 	

NEWS

@@ -1,18 +1,46 @@
 Changelog for s6-boot
 
-In 0.1.8
+In 0.2.1
+--------
 	
-	-- add data/scripts/modules.sh : the variable MODULES at s6.conf was
+	- Bugs fix
+	- rc database for root is started at the same scandir than boot,
+	meaning /run/boot, with a prefix define at env/MASTER file.
+	- classic service for root used the same scandir than boot, meaning
+	/run/boot/service.
+	- data/scripts/user.sh : this file was renamed as master.sh and only
+	manage root supervision tree creation.
+	- S6.conf : new features TTY which allow to start multiple tty at 
+	boot time.
+	- Earlier tty is now started at tty6 instead of tty2.
+	
+
+In 0.2.0
+--------
+	
+	- 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
 --------

_s6-svc

@@ -1,5 +1,5 @@
 #compdef s6-svc
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/SIGHUP

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/SIGINT

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/SIGQUIT

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/SIGTERM

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/SIGUSR1

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/SIGUSR2

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/crash

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/.s6-svscan/finish

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -S0
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/s6-svscan-log/run

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

classic/service/tty1/run

@@ -1,14 +0,0 @@
-#!@BINDIR@/bash
-# 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.
-
-source /etc/obarun/s6opts.conf
-if s6-svok ${LIVE_CLASSIC_PATH}/s6rc-fdholder; then
-exec -c /usr/bin/agetty -J 38400 tty1
-fi

classic/service/tty6/run

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -8,4 +8,4 @@
 # This file may not be copied, modified, propagated, or distributed
 # except according to the terms contained in the LICENSE file.
 
-/usr/bin/agetty --delay 02 -J 38400 tty2
+/usr/bin/agetty --delay 02 -J 38400 tty6

compiled/default/servicedirs/udevd-udev/run

@@ -1,5 +1,5 @@
 #!/usr/local/bin/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

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/master.sh

@@ -0,0 +1,114 @@
+#!@BINDIR@/bash
+# Copyright (c) 2015-2018 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.
+
+
+exec 2>&1
+exec 1>/var/log/master.log
+
+log(){
+	printf "%s %s %s\n" "$(date +"%Y-%m-%d %H:%M:%S")" "${FUNCNAME[1]} ::" "${@}"
+}
+
+ENV="/etc/s6/env"
+DEST=$(<${ENV}/DEST) #/run/boot
+
+if ! source /etc/obarun/s6opts.conf; then
+	out_error "/etc/obarun/s6opts.conf not found, existing"
+	exit 1
+else
+	SOURCE="/etc/obarun/s6opts.conf"
+fi
+GEN_NAME=$(<${ENV}/MASTER)
+DEST_USER=$(<${ENV}/DEST)
+LIVE_CLASSIC_PATH=${DEST_USER}/service
+LIVE_RC_PATH=${DEST_USER}
+LIST_SERV=$(ls ${CLASSIC_ENABLED})
+
+add_env() {
+	local -a list_env=$(printenv)
+	local var value line list
+	
+	log "mkdir ${DEST}/env"
+	mkdir -p -m 0755 ${DEST}/env
+	
+	while read line;do
+	
+		if [[ "${line:0:1}" == "#" ]] || [[ -z "${line}" ]];then
+			continue
+		fi
+				
+		var=$(awk -F"=" '{print $1}' <<< "${line}")
+		value=${!var}
+		
+		log "create new file ${var} with ${value} at ${DEST}/env/"
+		touch ${DEST}/env/"${var}"
+		echo "${value}" > ${DEST}/env/"${var}"
+
+	done < "${SOURCE}"
+	
+		
+	# need improvement
+	for list in ${list_env[@]};do
+		
+		while read line;do
+			
+			var=$(awk -F"=" '{print $1}' <<< "${line}")
+			value=${!var}
+			
+			case "${var}" in
+				_|?|PWD|G_DEBUG) continue
+					;;
+				*)
+					log "create new file ${var} with ${value} at ${DEST}/env/"
+					touch ${DEST}/env/"${var}"
+					echo "${value}" > ${DEST}/env/"${var}"
+					;;
+			esac
+		done <<< "${list}"
+				
+	done
+	for tidy_loop in GEN_NAME DEST_USER LIVE_CLASSIC_PATH LIVE_RC_PATH;do
+		var=${!tidy_loop}
+		log "create new file ${tidy_loop} with ${var} at ${DEST}/env"
+		touch ${DEST}/env/"${tidy_loop}"
+		echo "${var}" > ${DEST}/env/"${tidy_loop}"
+	done
+	
+	unset list_env var value line list
+}
+
+
+# copy daemon enabled by USER
+enabled_daemon() {
+	for serv in ${LIST_SERV[@]};do
+		log "enable ${serv} daemon"
+		ln -sfT ${CLASSIC_ENABLED}/${serv} ${LIVE_CLASSIC_PATH}/${serv} 
+	done
+}
+
+start_database() {
+	log "init s6-rc database with -l ${LIVE_RC_PATH}/${GEN_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH}"
+	s6-rc-init -l ${LIVE_RC_PATH}/${GEN_NAME} -c ${RC_DATABASE_COMPILED}/current -p ${GEN_NAME} ${LIVE_CLASSIC_PATH}
+	s6-rc -v 3 -l ${LIVE_RC_PATH}/${GEN_NAME} -u change All
+}
+
+start() {
+		
+	#add_env || exit 1
+	
+	enabled_daemon || exit 1
+	
+	svscanctl -an "${LIVE_CLASSIC_PATH}" 2>/dev/null 
+		
+	start_database || exit 1
+
+}
+
+start

data/scripts/modules.sh

@@ -1,5 +1,5 @@
 #!@BINDIR@/bash
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

data/scripts/s6.local

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

data/scripts/user.sh

@@ -1,254 +0,0 @@
-#!@BINDIR@/bash
-# 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.
-
-exec 2>&1
-exec 1>>/var/log/user.log
-
-log(){
-	printf "%s %s %s\n" "$(date +"%Y-%m-%d %H:%M:%S")" "${FUNCNAME[1]} ::" "${@}"
-}
-
-# ${1} user name
-# ${2} action to do, add or del
-
-if [[ -z "${1}" ]] || [[ -z "${2}" ]];then
-	log "handle-user :: Missing arguments, existing"
-	exit 1
-fi
-if [[ "${1}" == "root" ]]; then
-	log "root user, nothing to do, exiting 0"
-	exit 0
-fi
-
-ENV="/etc/s6/env"
-DEST=$(head -n1 ${ENV}/DEST) #/run/boot
-TEMPLATE=$(head -n1 ${ENV}/TEMPLATE) #/usr/share/obarun/s6opts/template
-SOURCE=""
-
-USER="${1}"
-# special case here, adduser scipts call
-# user.sh with boot as user, but this user
-# doesn't exist, wrap the uid,gid to root
-if [[ "${USER}" == "boot" ]]; then
-    _UID=$(id -u 0)
-	_GID=$(id -g 0)
-else
-    _UID=$(id -u ${USER})
-    _GID=$(id -g ${USER})
-fi
-
-# overwrite conf if connected with user
-if ! (( "${_UID}" == 0 )); then
-	if ! source $(getent passwd ${USER}|cut -d : -f 6)/service/service.conf 2>/dev/null; then
-		out_error "$(getent passwd ${USER}|cut -d : -f 6)/service/service.conf doesn't exist"
-		out_error "Use s6opts user command first"
-		exit 1
-	else
-		SOURCE="$(getent passwd ${USER}|cut -d : -f 6)/service/service.conf"
-	fi
-elif ! source /etc/obarun/s6opts.conf; then
-	out_error "/etc/obarun/s6opts.conf not found, existing"
-	exit 1
-else
-	SOURCE="/etc/obarun/s6opts.conf"
-fi
-
-# at this point, the good .conf file is sourced
-# we know all needed variables
-
-# do not pass if DEST_USER already exist
-if [[ -d "${DEST_USER}" ]] && [[ "${2}" == "add" ]]; then
-	log "${DEST_USER} already exist, nothing to do"
-	exit 0
-fi
-
-LIST_SERV=$(ls ${CLASSIC_ENABLED})
-# coming from boot time? so respect the choice of the .conf files
-# and change the name of USER variable.
-if [[ "${USER}" == "boot" ]]; then
-	USER="${DEST_USER##*/}"
-fi
-
-copy_template() {
-	log "mkdir ${DEST}/service/${USER}/{log,env}"
-	mkdir -p -m 0755 ${DEST}/service/${USER}/{log,env}
-	log "s6-hiercopy from ${TEMPLATE}/base/ to ${DEST}/service/${USER}"
-	/usr/bin/s6-hiercopy ${TEMPLATE}/base/run ${DEST}/service/${USER}/run
-	/usr/bin/s6-hiercopy ${TEMPLATE}/base/log ${DEST}/service/${USER}/log
-	/usr/bin/s6-hiercopy ${TEMPLATE}/base/env ${DEST}/service/${USER}/env 
-}
-
-parse_env() {
-	local named 
-	log "replace base by ${USER} at LOG,run,log/run files"
-	for named in ${DEST}/service/${USER}/env/LOG ${DEST}/service/${USER}/{run,log/run}; do
-		sed -i "s:base:${USER}:g" $named
-	done
-
-	unset named
-}
-
-add_env() {
-	local -a list_env=$(printenv)
-	local var value line list
-	
-	
-	while read line;do
-	
-		if [[ "${line:0:1}" == "#" ]] || [[ -z "${line}" ]];then
-			continue
-		fi
-				
-		var=$(awk -F"=" '{print $1}' <<< "${line}")
-		value=$(echo ${!var})
-		
-		log "create new file ${var} with ${value} at ${DEST}/service/${USER}/env/"
-		touch ${DEST}/service/${USER}/env/"${var}"
-		echo "${value}" > ${DEST}/service/${USER}/env/"${var}"
-
-	done < "${SOURCE}"
-	
-	#special env need to be create
-	log "create new file USER with ${USER} at ${DEST}/service/${USER}/env/"
-	touch ${DEST}/service/${USER}/env/USER
-	echo "${USER}" > ${DEST}/service/${USER}/env/USER
-	
-	log "create new file UID with ${_UID} at ${DEST}/service/${USER}/env/"
-	touch ${DEST}/service/${USER}/env/UID
-	echo "${_UID}" > ${DEST}/service/${USER}/env/UID
-	
-	log "create new file GID with ${_GID} at ${DEST}/service/${USER}/env/"
-	touch ${DEST}/service/${USER}/env/UID
-	echo "${_GID}" > ${DEST}/service/${USER}/env/GID
-	
-	#su -l "${USER}" -c 'env'
-	
-	# need improvement
-	for list in ${list_env[@]};do
-		
-		while read line;do
-			
-			var=$(awk -F"=" '{print $1}' <<< "${line}")
-			value=$(echo ${!var})
-			
-			case "${var}" in
-				_|?|GID|UID|PWD|G_DEBUG|LOG) continue
-					;;
-				*)
-					log "create new file ${var} with ${value} at ${DEST}/service/${USER}/env/"
-					touch ${DEST}/service/${USER}/env/"${var}"
-					echo "${value}" > ${DEST}/service/${USER}/env/"${var}"
-					;;
-			esac
-		done <<< "${list}"
-				
-	done
-
-	unset list_env var value line list
-}
-create_destuser() {
-	local tidy
-	
-	log "create ${DEST_USER} directory"
-	mkdir -p ${DEST_USER}
-	log "create ${LIVE_CLASSIC_PATH} directory"
-	mkdir -p ${LIVE_CLASSIC_PATH}/.s6-svscan
-	log "create ${LIVE_RC_PATH} directory"
-	mkdir -p ${LIVE_RC_PATH}
-	
-	
-	log "copy ${TEMPLATE}/base/.s6-svscan to ${LIVE_CLASSIC_PATH}}/.s6-svscan"
-	/usr/bin/s6-hiercopy ${TEMPLATE}/base/.s6-svscan ${LIVE_CLASSIC_PATH}/.s6-svscan
-	
-	# parse all SIG* file to point to the right place
-	for tidy in ${LIVE_CLASSIC_PATH}/.s6-svscan/{SIG{HUP,INT,QUIT,TERM,USR1,USR2},finish,crash}; do
-		log "change base by ${USER} at $tidy"
-		sed -i "s:base:${USER}:g" $tidy 
-	done
-	
-	log "change owner and permissions of ${DEST_USER} directory"
-	chown -R ${_UID}:root ${DEST_USER}
-	chmod 755 -R ${DEST_USER}
-	unset tidy
-}
-
-# copy daemon enabled by USER
-enabled_daemon() {
-	log "enable daemon for $USER"
-	for serv in ${LIST_SERV[@]};do
-		ln -sfT ${CLASSIC_ENABLED}/${serv} ${LIVE_CLASSIC_PATH}/${serv} 
-	done
-}
-
-start_database() {
-	log "init s6-rc database"
-	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
-	else
-		su ${USER} -c "s6-rc-init -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH}" 
-		su ${USER} -c "s6-rc -v 3 -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -u change All"
-	fi
-}
-
-# ${1} s6 program 
-# ${2} command to pass
-# ${3} target
-s6_cmd() {
-	local prog="${1}" cmd="${2}" target="${3}"
-	log "do a s6-${prog} -${cmd} ${target} command"
-	eval s6-"${prog}" -"${cmd}" "${target}"
-	
-	unset prog cmd target
-}
-
-add() {
-	
-	copy_template || exit 1
-	
-	parse_env || exit 1
-	
-	add_env || exit 1
-	
-	create_destuser || exit 1
-	
-	s6_cmd "svscanctl" "an" "${DEST}/service" || exit 1
-	
-	enabled_daemon || exit 1
-	
-	s6_cmd "svscanctl" "an" "${DESTUSER}/${USER}/${DESTCLASSIC}" 2>/dev/null || exit 1
-	
-	start_database || exit 1
-}
-
-del() {
-	s6_cmd "svc" "wD -d -T2000" "${DEST}/service/${USER}" 
-	
-	if ! [[ -z $(s6-svstat ${DEST}/service/${USER}|grep down) ]];then
-		s6_cmd "svc" "kO" "${DEST}/service/${USER}"
-	fi
-	log "remove ${DEST}/service/${USER} directory"
-	rm -rf "${DEST}/service/${USER}/"
-	s6_cmd "svscanctl" "an" "${DEST}/service/"
-	log "remove ${DEST_USER} directory"
-	rm -rf "${DEST_USER}"
-}
-
-case "${2}" in
-	add)
-		add
-		;;
-	del)
-		del
-		;;
-	*)
-		exit 1
-		;;
-esac

env/MASTER

@@ -0,0 +1 @@
+master-

init

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

poweroff

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/All/contents

@@ -1,3 +1,4 @@
 00
 all-Boot
 adduser
+tty

rc/adduser/up

@@ -11,6 +11,6 @@
 fdmove -c 2 1
 importas -i HANDLE HANDLE
 if { s6-echo -- start adduser }
-if { ${HANDLE}/user.sh "boot" add }
+if { ${HANDLE}/master.sh }
 s6-echo -- adduser started successfully
 

rc/checkfs-btrfs/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/checkfs-dmraid/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/checkfs-lvm/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -25,6 +25,6 @@ ifelse -X { s6-test $USELVM = yes }
 			/usr/bin/vgchange -ay
 		}
 		foreground { pkill lvmetad }
-		s6-echo -- lvm-prepare successfully started
+		s6-echo -- checkfs-lvm successfully started
 	}
 s6-echo -- lvm-prepare desactived

rc/rofs-Udevd/contents

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

rc/rofs-cgroups/down

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -9,14 +9,13 @@
 # except according to the terms contained in the LICENSE file.
 
 fdmove -c 2 1
-foreground {
-	redirfd -r 0 /proc/cgroups
-	pipeline { s6-tail -n +2 }
-	pipeline { s6-cut -d"\t" -f1 }
-	pipeline { s6-grep -vF -- devices }
-	forstdin -d"\n" -- i
-	importas -ui i i
-	if { mountpoint -q /sys/fs/cgroup/${i} }
-	umount -R /sys/fs/cgroup/${i}
-}
-umount /sys/fs/cgroup
+if { s6-echo "unmounting cgroup" }
+redirfd -r 0 /proc/cgroups
+pipeline { s6-tail -n +2 }
+pipeline { s6-cut -d"\t" -f1 }
+pipeline { s6-grep -vF -- devices }
+forstdin -d"\n" -- i
+importas -ui i i
+if { mountpoint -q /sys/fs/cgroup/${i} }
+umount -R /sys/fs/cgroup/${i}
+

rc/rofs-cgroups/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rofs-console/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -9,19 +9,22 @@
 # except according to the terms contained in the LICENSE file.
 
 fdmove -c 2 1
-importas -i S6CONF S6CONF
 if { s6-echo -- rofs-console started }
+importas -i S6CONF S6CONF
 s6-envdir ${S6CONF}
+importas -D "" TTY TTY
 importas -D "" KEYMAP KEYMAP
 importas -D "" FONT FONT
 importas -D "" FONT_MAP FONT_MAP
 importas -D "" FONT_UNIMAP FONT_UNIMAP
+foreground {
+	forbacktickx index { seq ${TTY} }
+	importas -u -D "" index index
+	bash -c "setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C /dev/tty${index}"
+}
+# special case for the earlier tty
+foreground { bash -c "setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C /dev/tty6" }
 foreground {
 	loadkeys -q -u $KEYMAP 
 }
-foreground {
-	forx index { 0 1 2 3 4 5 6 7 8 9 10 }
-	importas -u -D "" index index
-	exec bash -c "setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C /dev/tty${index}"
-}
 s6-echo -- rofs-console successfully started

rc/rofs-hardclock/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rofs-kernmod/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rofs-kernruntime/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rofs-modules/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rofs-swap/down

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rofs-swap/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-cleanboot/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-dmesglog/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-end/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-fsrw/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-ip6tables/down

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -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/rwfs-ip6tables/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-iptables/down

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-iptables/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-localtime/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-loopback/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-nonetwork/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-random/down

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-random/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-s6local/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/rwfs-tmpdir/up

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

rc/tty/dependencies

@@ -0,0 +1 @@
+adduser

rc/tty/up

@@ -0,0 +1,30 @@
+#!@BINDIR_EXECLINE@/execlineb -P
+# Copyright (c) 2015-2018 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 -- tty started }
+importas -i DEST DEST
+importas -i S6CONF S6CONF
+s6-envdir ${S6CONF}
+importas -D "" TTY TTY
+foreground {
+	forbacktickx index { seq ${TTY} }
+	importas -i index index
+	if { mkdir -p ${DEST}/service/tty${index} }
+	foreground { 
+		redirfd -a 1 ${DEST}/service/tty${index}/run
+		s6-echo -- 
+"#!/usr/bin/bash 
+/usr/bin/agetty -J 38400 tty${index}"
+	 }
+	s6-chmod 0755 ${DEST}/service/tty${index}/run
+}
+if { s6-svscanctl -an ${DEST}/service }
+s6-echo -- tty successfully started

rc/udevd-udev/run

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

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

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -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
-

reboot

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -P
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

s6.conf

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -38,6 +38,10 @@ HARDWARECLOCK=UTC
 # Set timezone, availables timezones at /usr/share/zoneinfo.
 TZ=GMT
 
+# Number of tty to start.
+# The number MUST be included between 1-5.
+TTY=2
+
 # Keymap to load, see loadkeys(8), default us.
 KEYMAP=us
 

shutdown

@@ -1,5 +1,5 @@
 #!@BINDIR@/bash
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in

stage2.tini

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -S0
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in
@@ -9,14 +9,17 @@
 # except according to the terms contained in the LICENSE file.
 
 s6-envdir -if /etc/s6/env
+importas -i DEST DEST
 importas -i DESTRC DESTRC
 importas -i S6CONF S6CONF
+importas -i MASTER MASTER
 
 if { s6-echo -- "***************************************************************************" }
 if { s6-echo -- "**                        Start Tini shutdown                            **" }
 if { s6-echo -- "***************************************************************************" }
 cd /
 foreground { s6-rc -v 3 -l ${DESTRC} -da change }
+foreground { s6-rc -v 3 -l ${DEST}/${MASTER} -da change }
 
 s6-envdir -if ${S6CONF}
 
@@ -26,6 +29,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                       **" }

stage3

@@ -1,5 +1,5 @@
 #!@BINDIR_EXECLINE@/execlineb -S0
-# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
+# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
 # All rights reserved.
 # 
 # This file is part of Obarun. It is subject to the license terms in