From f7df2f7bb6abbea365cccb1345dcf1a1b7a80797 Mon Sep 17 00:00:00 2001
From: PS <p@0x53.net>
Date: Sat, 7 Feb 2026 10:16:45 +0100
Subject: Improve usertree shutdown; improve system .s6-svscan directory

---
 src/bin/prepare-svscan         |  2 +-
 src/bin/system-shutdown-daemon |  2 +-
 src/bin/user-init              |  4 ++++
 src/bin/user-shutdown          | 15 +--------------
 4 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'src/bin')

diff --git a/src/bin/prepare-svscan b/src/bin/prepare-svscan
index 9fe7f8d..05fd356 100755
--- a/src/bin/prepare-svscan
+++ b/src/bin/prepare-svscan
@@ -21,7 +21,7 @@ redirfd -wnb 1 ${RUNDIR}/service/s6-svscan-log/fifo
 background {
 	redirfd -w 2 ${RUNDIR}/service/s6-svscan-log/fifo
 	if -x0 -n { eltest -d ${RUNDIR}/s6-rc }
-		foreground { echo "\ninit!\n" }
+		foreground { echo "\ninit\n" }
 		if {
 			s6-rc-init
 				-c ${WORKINGDIR}/compiled
diff --git a/src/bin/system-shutdown-daemon b/src/bin/system-shutdown-daemon
index 6419bfb..9e6850e 100755
--- a/src/bin/system-shutdown-daemon
+++ b/src/bin/system-shutdown-daemon
@@ -5,7 +5,7 @@
 tryexec { ./stage3b }
 
 if -n {
-	foreground { echo "\nsystem-shutdown!\n" }
+	foreground { echo "\nshutdown\n" }
 	foreground { s6-rc -l @tmpfsdir@/@sysrundir@/s6-rc -v2 -b -Da -t@timeout@ change }
 	foreground {
 		pipeline { ls -1 @tmpfsdir@/@sysrundir@/service/ }
diff --git a/src/bin/user-init b/src/bin/user-init
index aa24f9d..120398f 100755
--- a/src/bin/user-init
+++ b/src/bin/user-init
@@ -11,6 +11,10 @@ multisubstitute {
 		PATH
 }
 
+ifelse { eltest -d @tmpfsdir@/@usrrundir@/${USER}/${USERTREE} } {
+	exit 100
+}
+
 backtick HOME { homeof ${USER} }
 importas -Si HOME
 
diff --git a/src/bin/user-shutdown b/src/bin/user-shutdown
index 9376f5b..48311bd 100755
--- a/src/bin/user-shutdown
+++ b/src/bin/user-shutdown
@@ -6,18 +6,5 @@ multisubstitute {
 	importas -Si USER
 	importas -Si USERTREE
 }
-backtick -Ei HOME { homeof ${USER} }
 
-if -x0 { eltest -d @tmpfsdir@/@usrrundir@/${USER}/${USERTREE} }
-
-redirfd -wnb 1 @tmpfsdir@/@usrrundir@/${USER}/${USERTREE}/service/s6-svscan-log/fifo
-fdmove -c 2 1
-
-foreground {
-	foreground { echo "\nshutdown\n" }
-	s6-rc -l @tmpfsdir@/@usrrundir@/${USER}/${USERTREE}/s6-rc -v2 -b -da -t@timeout@ change
-}
-
-foreground { s6-svscanctl -t @tmpfsdir@/@usrrundir@/${USER}/${USERTREE}/service }
-foreground { s6-svc -h @tmpfsdir@/@usrrundir@/${USER}/${USERTREE}/service/s6-svscan-log }
-foreground { rm -Rf @tmpfsdir@/@usrrundir@/${USER}/${USERTREE} }
+s6-svc -U @tmpfsdir@/@usrrundir@/${USER}/${USERTREE}/service/goetia-shutdown
-- 
cgit v1.2.3