remove live check from openrc-user-hook

Reviewed-on: #27

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/scripts/dinit-hook

@@ -46,7 +46,6 @@ 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 "$@" ;;

openrc/hooks/openrc-user-install.hook

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

@@ -0,0 +1,50 @@
+#!/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) create_user_symlinks ;;
+  add) svc_add_help ;;
+  del) svc_del_help ;;
+  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
+esac
+
+exit 0

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

@@ -17,8 +17,8 @@ cmds_s6() {
 cmds_dinit() {
     COMMANDS[start]="dinitctl start ${SV}"
     COMMANDS[stop]="dinitctl stop ${SV}"
-    COMMANDS[enable]="ln -s /etc/dinit.d/${SV} /etc/dinit.d/boot.d/"
-    COMMANDS[disable]="rm /etc/dinit.d/boot.d/${SV}"
+    COMMANDS[enable]="dinitctl -o enable ${SV}"
+    COMMANDS[disable]="dinitctl -o disable ${SV}"
 }
 
 cmds_runit() {