Fix runit/s6 calamares chroot service activation

Makefile

@@ -21,13 +21,8 @@ S6CRONIEHOOKS = $(wildcard s6/cronie-hooks/*)
 S6DBUSHOOKS = $(wildcard s6/dbus-hooks/*)
 S6ATDHOOKS = $(wildcard s6/atd-hooks/*)
 
-DINITSYSTEMSCRIPTS = $(wildcard dinit/scripts/system/*)
+DINITSCRIPTS = $(wildcard dinit/scripts/*)
-DINITUSERSCRIPTS = $(wildcard dinit/scripts/user/*)
+DINITHOOKS = $(wildcard dinit/hooks/*)
-DINITSYSTEMHOOKS = $(wildcard dinit/hooks/system/*)
-DINITUSERHOOKS = $(wildcard dinit/hooks/user/*)
-
-DINITUSERSPAWNSCRIPTS = $(wildcard dinit/scripts/user-spawn/*)
-DINITUSERSPAWNHOOKS = $(wildcard dinit/hooks/user-spawn/*)
 
 DINITCRONIEHOOKS = $(wildcard dinit/cronie-hooks/*)
 DINITDBUSHOOKS = $(wildcard dinit/dbus-hooks/*)
@@ -83,16 +78,8 @@ install_s6: install_common
 	install $(MODE) $(S6HOOKS) $(DESTDIR)$(HOOKSDIR)
 
 install_dinit: install_common
-	install $(EMODE) $(DINITSYSTEMSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
+	install $(EMODE) $(DINITSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
-	install $(MODE) $(DINITSYSTEMHOOKS) $(DESTDIR)$(HOOKSDIR)
+	install $(MODE) $(DINITHOOKS) $(DESTDIR)$(HOOKSDIR)
-
-install_dinit_user: install_common
-	install $(EMODE) $(DINITUSERSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
-	install $(MODE) $(DINITUSERHOOKS) $(DESTDIR)$(HOOKSDIR)
-
-install_dinit_user_spawn: install_common
-	install $(EMODE) $(DINITUSERSPAWNSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
-	install $(MODE) $(DINITUSERSPAWNHOOKS) $(DESTDIR)$(HOOKSDIR)
 
 install_openrc_cronie: install_hook_common
 	install $(MODE) $(OPENRCCRONIEHOOKS) $(DESTDIR)$(HOOKSDIR)
@@ -125,4 +112,4 @@ install_wrapper:
 	install $(DMODE) $(DESTDIR)$(BINDIR)
 	install $(EMODE) $(WRAPPER) $(DESTDIR)$(BINDIR)
 
-.PHONY: install install_base install_s6 install_openrc install_runit install_dinit install_wrapper install_dinit_user install_dinit_user_spawn
+.PHONY: install install_base install_s6 install_openrc install_runit install_dinit install_wrapper

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

@@ -1,9 +0,0 @@
-[Trigger]
-Type = Package
-Operation = Install
-Target = dinit-user-spawn
-[Action]
-Description = Enabling dinit user spawn service ...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/dinit-user-spawn-hook enable
-# NeedsTargets

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

@@ -1,9 +0,0 @@
-[Trigger]
-Type = Package
-Operation = Remove
-Target = dinit-user-spawn
-[Action]
-Description = Disabling dinit user spawn service ...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/dinit-user-spawn-hook disable
-# NeedsTargets

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

@@ -1,11 +0,0 @@
-[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-user-hook addU
-NeedsTargets

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

@@ -1,10 +0,0 @@
-[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-user-hook delU
-NeedsTargets

dinit/scripts/dinit-hook

@@ -14,25 +14,13 @@ 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
 }
 
@@ -64,8 +52,6 @@ case $op in
   restart)  dinit_live; restart_service "$1" ;;
   add)      svc_add_help ;;
   del)      svc_del_help ;;
-  addU)      svc_user_add_help ;;
-  delU)      svc_user_del_help ;;
   *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 

dinit/scripts/user-spawn/dinit-user-spawn-hook

@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-handle_user_spawn() {
-    if [ ! -S /run/dinitctl ]; then
-        echo >&2 "  Current root is not booted."
-        dinitctl "$1" -o "$2"
-    else
-        dinitctl "$1" "$2"
-    fi
-}
-
-op="$1"; shift
-
-case $op in
-  enable) handle_user_spawn "$op" 'dinit-user-spawn' ;;
-  disable) handle_user_spawn "$op" 'dinit-user-spawn' ;;
-  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
-esac
-
-exit 0

dinit/scripts/user/dinit-user-hook

@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-svc_help(){
-    echo "	==> Start/stop/restart a service:"
-    echo "	dinitctl <start/stop/restart> <service>"
-}
-
-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
-}
-
-op="$1"; shift
-
-case $op in
-  addU)      svc_user_add_help ;;
-  delU)      svc_user_del_help ;;
-  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
-esac
-
-exit 0

openrc/hooks/30-openrc-upgrade.hook

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

openrc/hooks/openrc-user-install.hook

@@ -1,11 +0,0 @@
-[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

@@ -1,10 +0,0 @@
-[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

@@ -1,80 +1,46 @@
 #!/bin/sh -e
 
 openrc_live() {
-    if [ ! -f /run/openrc/softlevel ]; then
+  if [ ! -f /run/openrc/softlevel ]; then
-        echo >&2 "  Skipped: Current root is not booted."
+    echo >&2 "  Skipped: Current root is not booted."
-        exit 0
+    exit 0
-    fi
+  fi
-}
-
-each_conf() {
-    while read -r f; do
-        "$@" "/$f"
-    done
 }
 
 svc_help(){
-    arg="${1:-}"
+    echo "	==> Start/stop/restart a service:"
-    str="${arg#--*}"
+    echo "	rc-service <service> <start/stop/restart>"
-    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:-}"
+    echo "	==> Add a service to runlevel:"
-    str="${arg#--*}"
+    echo "	rc-update add <service> <runlevel>"
-    if [ -n "$str" ]; then
+    svc_help
-        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:-}"
+    echo "	==> Remove a service from runlevel:"
-    str="${arg#--*}"
+    echo "	rc-update del <service> <runlevel>"
-    if [ -n "$str" ]; then
+    svc_help
-        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() {
+each_conf() {
-    umin=$(grep "^UID_MIN" /etc/login.defs)
+  while read -r f; do
-    umax=$(grep "^UID_MAX" /etc/login.defs)
+    "$@" "/$f"
-    users=$(awk -F':' -v "min=${umin##UID_MIN}" -v "max=${umax##UID_MAX}" \
+  done
-        '{ 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 ;;
+  sysctl)   openrc_live; each_conf /usr/bin/sysctl -q -p ;;
-    binfmt) openrc_live; each_conf /usr/lib/openrc/sh/binfmt.sh ;;
+  binfmt)   openrc_live; each_conf /usr/lib/openrc/sh/binfmt.sh ;;
-    reexec) svc_user_ln; openrc_live; /usr/bin/openrc-shutdown -R ;;
+  reexec) openrc_live; /usr/bin/openrc-shutdown -R ;;
     # For use by other packages
-    reload) openrc_live; /usr/bin/rc-service "$@" reload ;;
+  reload)        openrc_live; /usr/bin/rc-service "$@" reload ;;
-    add) svc_add_help ;;
+  add) svc_add_help ;;
-    del) svc_del_help ;;
+  del) svc_del_help ;;
-    uadd) svc_add_help "--user" ;;
+  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
-    udel) svc_del_help "--user" ;;
-    *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 
 exit 0

wrapper/artix-service

@@ -22,6 +22,8 @@ cmds_dinit() {
 }
 
 cmds_runit() {
+    mkdir -p /run/runit
+    ln -s /etc/runit/runsvdir/current /run/runit/service 2>/dev/null
     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/"
@@ -84,3 +86,5 @@ case "${ACTION}" in
     help) usage; exit 0 ;;
     *) usage; exit 1 ;;
 esac
+
+[ ${INIT} == s6 ] && s6-db-reload