dinit: fix user spawn handling in chroot

Reviewed-on: artix/alpm-hooks#27

Makefile

@@ -2,6 +2,7 @@ PREFIX ?= /usr
 ALPMDIR = $(PREFIX)/share/libalpm
 SCRIPTSDIR = $(ALPMDIR)/scripts
 HOOKSDIR = $(ALPMDIR)/hooks
+BINDIR = $(PREFIX)/bin
 
 OPENRCSCRIPTS = $(wildcard openrc/scripts/*)
 OPENRCHOOKS = $(wildcard openrc/hooks/*)
@@ -39,8 +40,6 @@ SYSUSERSHOOKS = $(wildcard esysusers/hooks/*)
 
 WRAPPER = $(wildcard wrapper/*)
 
-WRAPPERDIR = $(PREFIX)/share/artix
-
 DMODE = -dm0755
 MODE = -m0644
 EMODE = -m0755
@@ -110,7 +109,7 @@ install_dinit_dbus: install_hook_common
 	install $(MODE) $(DINITDBUSHOOKS) $(DESTDIR)$(HOOKSDIR)
 
 install_wrapper:
-	install $(DMODE) $(DESTDIR)$(WRAPPERDIR)
+	install $(DMODE) $(DESTDIR)$(BINDIR)
-	install $(EMODE) $(WRAPPER) $(DESTDIR)$(WRAPPERDIR)
+	install $(EMODE) $(WRAPPER) $(DESTDIR)$(BINDIR)
 
 .PHONY: install install_base install_s6 install_openrc install_runit install_dinit install_wrapper

base/hooks/30-binfmt.hook

@@ -7,5 +7,5 @@ Target = usr/lib/binfmt.d/*.conf
 [Action]
 Description = Registering binary formats...
 When = PostTransaction
-Exec = /usr/share/libalpm/scripts/dinit-hook binfmt
+Exec = /usr/lib/artix/binfmt.sh
 NeedsTargets

dinit/hooks/dinit-user-install.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = etc/dinit.d/user/*
+
+[Action]
+Description = Displaying dinit user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-hook addU
+NeedsTargets

dinit/hooks/dinit-user-remove.hook

@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Remove
+Target = etc/dinit.d/user/*
+
+[Action]
+Description = Displaying dinit user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-hook delU
+NeedsTargets

dinit/hooks/dinit-user-spawn-install.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+# Operation = Upgrade
+Target = usr/lib/dinit.d/dinit-user-spawn
+
+[Action]
+Description = Enabling dinit user spawn ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-hook userspawnE
+NeedsTargets

dinit/hooks/dinit-user-spawn-remove.hook

@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Remove
+Target = usr/lib/dinit.d/dinit-user-spawn
+
+[Action]
+Description = Disabling dinit user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-hook userspawnD
+NeedsTargets

dinit/scripts/dinit-hook

@@ -14,13 +14,25 @@ svc_help(){
 
 svc_add_help(){
     echo "	==> Add a service:"
-    echo "	dinitctl enable <service>"
+    echo "	# dinitctl enable <service>"
     svc_help
 }
 
 svc_del_help(){
     echo "	==> Remove a service:"
-    echo "	dinitctl disable <service>"
+    echo "	# dinitctl disable <service>"
+    svc_help
+}
+
+svc_user_add_help(){
+    echo "	==> Add a user service:"
+    echo "	$ dinitctl enable <service>"
+    svc_help
+}
+
+svc_user_del_help(){
+    echo "	==> Remove a user service:"
+    echo "	$ dinitctl disable <service>"
     svc_help
 }
 
@@ -42,17 +54,29 @@ restart_service() {
     fi
 }
 
+handle_user_spawn() {
+    if [ ! -S /run/dinitctl ]; then
+        echo >&2 "  Current root is not booted."
+        dinitctl "$1" -o dinit-user-spawn
+    else
+        dinitctl "$1" dinit-user-spawn
+    fi
+}
+
 op="$1"; shift
 
 case $op in
   sysctl)   dinit_live; each_conf /usr/bin/sysctl -q -p ;;
-  binfmt)   dinit_live; /usr/bin/dinitctl restart binfmt ;;
   dbus_reload) dinit_live; reload_dbus ;;
     # For use by other packages
   reload)   dinit_live; /usr/bin/dinitctl reload "$@"; /usr/bin/dinitctl restart "$@" ;;
   restart)  dinit_live; restart_service "$1" ;;
   add)      svc_add_help ;;
   del)      svc_del_help ;;
+  addU)      svc_user_add_help ;;
+  delU)      svc_user_del_help ;;
+  userspawnE) handle_user_spawn enable ;;
+  userspawnD) handle_user_spawn disable ;;
   *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 

openrc/hooks/30-openrc-upgrade.hook

@@ -4,6 +4,6 @@ Operation = Upgrade
 Target = openrc
 
 [Action]
-Description = Reexecuting init ...
+Description = Configuring user service & reexecuting init ...
 When = PostTransaction
 Exec = /usr/share/libalpm/scripts/openrc-hook reexec

openrc/hooks/openrc-user-install.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = etc/user/init.d/*
+
+[Action]
+Description = Displaying openrc user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/openrc-hook uadd
+NeedsTargets

openrc/hooks/openrc-user-remove.hook

@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Remove
+Target = etc/user/init.d/*
+
+[Action]
+Description = Displaying openrc user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/openrc-hook udel
+NeedsTargets

openrc/scripts/openrc-hook

@@ -7,39 +7,73 @@ openrc_live() {
     fi
 }
 
-svc_help(){
-    echo "	==> Start/stop/restart a service:"
-    echo "	rc-service <service> <start/stop/restart>"
-}
-
-svc_add_help(){
-    echo "	==> Add a service to runlevel:"
-    echo "	rc-update add <service> <runlevel>"
-    svc_help
-}
-
-svc_del_help(){
-    echo "	==> Remove a service from runlevel:"
-    echo "	rc-update del <service> <runlevel>"
-    svc_help
-}
-
 each_conf() {
     while read -r f; do
         "$@" "/$f"
     done
 }
 
+svc_help(){
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Start/stop/restart a $str service:"
+    else
+        echo "	==> Start/stop/restart a service:"
+    fi
+    echo "	rc-service <service> <start/stop/restart>" "$arg"
+}
+
+svc_add_help(){
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Add a $str service to runlevel:"
+    else
+        echo "	==> Add a service to runlevel:"
+    fi
+    echo "	rc-update add <service> <runlevel>" "$arg"
+    svc_help "$arg"
+}
+
+svc_del_help(){
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Remove a $str service from runlevel:"
+    else
+        echo "	==> Remove a service from runlevel:"
+    fi
+    echo "	rc-update del <service> <runlevel>" "$arg"
+    svc_help "$arg"
+}
+
+svc_user_ln() {
+    umin=$(grep "^UID_MIN" /etc/login.defs)
+    umax=$(grep "^UID_MAX" /etc/login.defs)
+    users=$(awk -F':' -v "min=${umin##UID_MIN}" -v "max=${umax##UID_MAX}" \
+        '{ if ( $3 >= min && $3 <= max ) print $0 }' /etc/passwd \
+            | cut -d: -f1)
+
+    for u in $users; do
+        if [ ! -e /etc/init.d/user.$u ]; then
+            ln -sv /etc/init.d/user /etc/init.d/user.$u
+        fi
+    done
+}
+
 op="$1"; shift
 
 case $op in
     sysctl) openrc_live; each_conf /usr/bin/sysctl -q -p ;;
     binfmt) openrc_live; each_conf /usr/lib/openrc/sh/binfmt.sh ;;
-  reexec) openrc_live; /usr/bin/openrc-shutdown -R ;;
+    reexec) svc_user_ln; openrc_live; /usr/bin/openrc-shutdown -R ;;
     # For use by other packages
     reload) openrc_live; /usr/bin/rc-service "$@" reload ;;
     add) svc_add_help ;;
     del) svc_del_help ;;
+    uadd) svc_add_help "--user" ;;
+    udel) svc_del_help "--user" ;;
     *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 

runit/hooks/30-binfmt.hook

@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/binfmt.d/*.conf
-
-[Action]
-Description = Registering binary formats...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/runit-hook binfmt
-NeedsTargets

runit/scripts/runit-hook

@@ -34,7 +34,6 @@ op="$1"; shift
 
 case $op in
   sysctl)   runit_live; each_conf /usr/bin/sysctl -q -p ;;
-  binfmt)   runit_live; each_conf /usr/lib/rc/sv.d/binfmt once ;;
     # For use by other packages
   reload)   runit_live; /usr/bin/sv "$@" reload ;;
   add)      svc_add_help ;;

s6/hooks/30-binfmt.hook

@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/binfmt.d/*.conf
-
-[Action]
-Description = Registering binary formats...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/s6-rc-hook binfmt
-NeedsTargets

s6/scripts/s6-rc-hook

@@ -51,7 +51,6 @@ op="$1"; shift
 
 case $op in
   sysctl)   s6_live; each_conf /usr/bin/sysctl -q -p ;;
-  binfmt)   s6_live; sh /etc/s6/sv/binfmt/shell_up ;;
   dbus_reload) s6_live; reload_dbus ;;
     # For use by other packages
   add)      svc_add_help ;;

wrapper/artix-service

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+cmds_openrc() {
+    COMMANDS[enable]="rc-update add ${SV} default"
+    COMMANDS[disable]="rc-update del ${SV} default"
+    COMMANDS[start]="rc-service ${SV} start"
+    COMMANDS[stop]="rc-service ${SV} stop"
+}
+
+cmds_s6() {
+    COMMANDS[start]="s6-rc -u change ${SV}"
+    COMMANDS[stop]="s6-rc -d change ${SV}"
+    COMMANDS[enable]="s6-service add default ${SV}"
+    COMMANDS[disable]="s6-service del default ${SV}"
+}
+
+cmds_dinit() {
+    COMMANDS[start]="dinitctl start ${SV}"
+    COMMANDS[stop]="dinitctl stop ${SV}"
+    COMMANDS[enable]="dinitctl -o enable ${SV}"
+    COMMANDS[disable]="dinitctl -o disable ${SV}"
+}
+
+cmds_runit() {
+    COMMANDS[start]="runsv /etc/runit/sv/${SV}"
+    COMMANDS[stop]="sv stop /etc/runit/sv/${SV}"
+    COMMANDS[enable]="ln -s /etc/runit/sv/${SV} /run/runit/service/"
+    COMMANDS[disable]="rm /run/runit/service/${SV}"
+}
+
+is_live() {
+    if [[ ! -d /run/openrc && "${INIT}" == "openrc" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    elif [[ ! -d /run/s6-rc && "${INIT}" == "s6" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    elif [[ ! -S /run/dinitctl && "${INIT}" == "dinit" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    elif [[ ! -d /run/runit && "${INIT}" == "runit" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    fi
+}
+
+detect() {
+    for i in "${SUPPORTED[@]}"; do
+        if [[ -f /usr/bin/"$i"-init ]]; then
+            INIT="$i"
+            cmds_"${INIT}"
+        fi
+    done
+}
+
+usage() {
+    cat <<EOF
+usage: ${0##*/} [action] [service]
+
+  actions:
+    enable
+    disable
+    start
+    stop
+EOF
+}
+
+readonly SUPPORTED=(openrc s6 dinit runit)
+declare -A COMMANDS
+
+INIT=
+ACTION="$1"
+SV="$2"
+
+if [[ -z "${SV}" ]]; then
+    usage; exit 1
+fi
+
+detect
+
+case "${ACTION}" in
+    start|stop)   is_live; ${COMMANDS["${ACTION}"]} ;;
+    enable|disable) ${COMMANDS["${ACTION}"]} ;;
+    help) usage; exit 0 ;;
+    *) usage; exit 1 ;;
+esac

wrapper/artix-svc

@@ -1,55 +0,0 @@
-#!/bin/sh
-
-sv_start() {
-	case "$init" in
-		openrc) exec /usr/bin/rc-service "$1" start ;;
-		runit) exec /usr/bin/sv start /run/runit/service/"$1" ;;
-		s6) exec /usr/bin/s6-rc -u change "$1" ;;
-		dinit) exec /usr/bin/dinitctl start "$1" ;;
-	esac
-}
-
-sv_stop() {
-	case "$init" in
-		openrc) exec /usr/bin/rc-service "$1" stop ;;
-		runit) exec /usr/bin/sv stop /run/runit/service/"$1" ;;
-		s6) exec /usr/bin/s6-rc -d change "$1" ;;
-		dinit) exec /usr/bin/dinitctl stop "$1" ;;
-	esac
-}
-
-sv_enable() {
-	case "$init" in
-		openrc) exec /usr/bin/rc-update add "$1" default ;;
-		runit) exec unlink /run/runit/service/"$1"/down ;;
-		s6) exec /usr/bin/s6-service add default "$1" ;;
-		dinit) exec /usr/bin/dinitctl enable "$1" ;;
-	esac
-}
-
-sv_disable() {
-	case "$init" in
-		openrc) exec /usr/bin/rc-update del "$1" default ;;
-		runit)  exec touch /run/runit/service/"$1"/down ;;
-		s6) exec /usr/bin/s6-service delete default "$1" ;;
-		dinit) exec /usr/bin/dinitctl disable "$1" ;;
-	esac
-}
-
-if [ -d /run/openrc ]; then
-	init=openrc
-elif [ -d /run/runit ]; then
-	init=runit
-elif [ -d /run/s6-rc ]; then
-	init=s6
-elif [ -S /run/dinitctl ]; then
-	init=dinit
-fi
-
-case "$1" in
-	start)   shift; sv_start   "$@" ;;
-	stop)    shift; sv_stop    "$@" ;;
-	enable)  shift; sv_enable  "$@" ;;
-	disable) shift; sv_disable "$@" ;;
-esac
-