Fix runit/s6 calamares chroot service activation

openrc/scripts/openrc-hook

@@ -10,23 +10,17 @@ openrc_live() {
 svc_help(){
     echo "	==> Start/stop/restart a service:"
     echo "	rc-service <service> <start/stop/restart>"
-    echo "	==> Further info on user services:"
-    echo "https://wiki.artixlinux.org/Main/OpenRC#User_Services"
 }
 
 svc_add_help(){
     echo "	==> Add a service to runlevel:"
     echo "	rc-update add <service> <runlevel>"
-    echo "	==> Add a user service to runlevel:"
-    echo "	rc-update add <service> <runlevel> -U"
     svc_help
 }
 
 svc_del_help(){
     echo "	==> Remove a service from runlevel:"
     echo "	rc-update del <service> <runlevel>"
-    echo "	==> Remove a user service from runlevel:"
-    echo "	rc-update del <service> <runlevel> -U"
     svc_help
 }
 

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