Merge branch 'dev' of https://framagit.org/Obarun/66 into dev

skel/rc.init

@@ -4,9 +4,9 @@
 ## the configuration file. By default /etc/66/init.conf or
 ## instructed by 66-boot via the -s option(see 66-boot documentation).
 CONF="$1"
-source "$CONF"
+. "$CONF"
 
-echo [Starting stage2 process ...] 1>&/dev/console
+echo [Starting stage2 process ...] >/dev/console 2>&1
 
 # initiate the database service
 echo [Initiate db of tree ${TREE}]

skel/rc.shutdown

@@ -4,7 +4,7 @@
 ## the configuration file. By default /etc/66/init.conf or
 ## instructed by 66-boot via the -s option(see 66-boot documentation).
 CONF="$1"
-source "$CONF"
+. "$CONF"
 
 ## By default the output goes to the uncaught-logs at
 ## /run/66/log/0/current

src/66/66-scandir.c

@@ -275,7 +275,7 @@ void write_bootlog(char const *live, char const *scandir)
 		EXECLINE_BINPREFIX "redirfd -rnb 0 fifo\n" \
 		S6_BINPREFIX "s6-setuidgid ") ;
 	auto_stralloc(&run,log_user) ;
-	auto_stralloc(&run,S6_BINPREFIX "\ns6-log -bpd3 -- 1 t ") ;
+	auto_stralloc(&run,"\n" S6_BINPREFIX "s6-log -bpd3 -- 1 t ") ;
 	auto_stralloc(&run,path) ;
 	auto_stralloc(&run,"\n") ;