openrc (#26)

Reviewed-on: #26

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

@@ -10,17 +10,23 @@ 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
 }
 

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() {