Fix runit/s6 calamares chroot service activation

dinit/hooks/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-hook addU
-NeedsTargets

dinit/hooks/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-hook delU
-NeedsTargets

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

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

@@ -1,10 +0,0 @@
-[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,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
 }
 
@@ -54,15 +42,6 @@ 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
@@ -73,10 +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 ;;
-  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 = 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

@@ -7,58 +7,26 @@ openrc_live() {
   fi
 }
 
-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>"
-    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>"
-    echo "	rc-update add <service> <runlevel>" "$arg"
+    svc_help
-    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>"
-    echo "	rc-update del <service> <runlevel>" "$arg"
+    svc_help
-    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}" \
-        '{ 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
 }
 
@@ -67,13 +35,11 @@ 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) 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 ;;
   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
 

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