Fix runit/s6 calamares chroot service activation

openrc/hooks/openrc-user-install.hook

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

openrc/scripts/openrc-hook

@@ -33,11 +33,11 @@ each_conf() {
 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 ;;
+  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 ;;
-  # For use by other packages
-  reload) openrc_live; /usr/bin/rc-service "$@" reload ;;
+    # For use by other packages
+  reload)        openrc_live; /usr/bin/rc-service "$@" reload ;;
   add) svc_add_help ;;
   del) svc_del_help ;;
   *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;

openrc/scripts/openrc-user-hook

@@ -1,50 +0,0 @@
-#!/bin/sh -e
-
-openrc_live() {
-  if [ ! -f /run/openrc/softlevel ]; then
-    echo >&2 "  Skipped: Current root is not booted."
-    exit 0
-  fi
-}
-
-svc_help(){
-    echo "	==> Start/stop/restart a service:"
-    echo "	rc-service -U <service> <start/stop/restart>"
-}
-
-svc_add_help(){
-    echo "	==> Add a user service to runlevel:"
-    echo "	rc-update -U add <service> <runlevel>"
-    svc_help
-}
-
-svc_del_help(){
-    echo "	==> Remove a user service from runlevel:"
-    echo "	rc-update -U del <service> <runlevel>"
-    svc_help
-}
-
-create_user_symlinks() {
-    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
-  create)   openrc_live; create_user_symlinks ;;
-  add) svc_add_help ;;
-  del) svc_del_help ;;
-  *) 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