dinit: change user spawn hook type to package

Reviewed-on: artix/alpm-hooks#28

Makefile

@@ -26,6 +26,9 @@ DINITUSERSCRIPTS = $(wildcard dinit/scripts/user/*)
 DINITSYSTEMHOOKS = $(wildcard dinit/hooks/system/*)
 DINITUSERHOOKS = $(wildcard dinit/hooks/user/*)
 
+DINITUSERSPAWNSCRIPTS = $(wildcard dinit/scripts/user-spawn/*)
+DINITUSERSPAWNHOOKS = $(wildcard dinit/hooks/user-spawn/*)
+
 DINITCRONIEHOOKS = $(wildcard dinit/cronie-hooks/*)
 DINITDBUSHOOKS = $(wildcard dinit/dbus-hooks/*)
 DINITATDHOOKS = $(wildcard dinit/atd-hooks/*)
@@ -87,6 +90,10 @@ install_dinit_user: install_common
 	install $(EMODE) $(DINITUSERSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
 	install $(MODE) $(DINITUSERHOOKS) $(DESTDIR)$(HOOKSDIR)
 
+install_dinit_user_spawn: install_common
+	install $(EMODE) $(DINITUSERSPAWNSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
+	install $(MODE) $(DINITUSERSPAWNHOOKS) $(DESTDIR)$(HOOKSDIR)
+
 install_openrc_cronie: install_hook_common
 	install $(MODE) $(OPENRCCRONIEHOOKS) $(DESTDIR)$(HOOKSDIR)
 
@@ -118,4 +125,4 @@ install_wrapper:
 	install $(DMODE) $(DESTDIR)$(BINDIR)
 	install $(EMODE) $(WRAPPER) $(DESTDIR)$(BINDIR)
 
-.PHONY: install install_base install_s6 install_openrc install_runit install_dinit install_wrapper
+.PHONY: install install_base install_s6 install_openrc install_runit install_dinit install_wrapper install_dinit_user install_dinit_user_spawn

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

@@ -0,0 +1,9 @@
+[Trigger]
+Type = Package
+Operation = Install
+Target = dinit-user-spawn
+[Action]
+Description = Enabling dinit user spawn service ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-user-spawn-hook enable
+# NeedsTargets

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

@@ -0,0 +1,9 @@
+[Trigger]
+Type = Package
+Operation = Remove
+Target = dinit-user-spawn
+[Action]
+Description = Disabling dinit user spawn service ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-user-spawn-hook disable
+# NeedsTargets

dinit/scripts/user-spawn/dinit-user-spawn-hook

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+handle_user_spawn() {
+    if [ ! -S /run/dinitctl ]; then
+        echo >&2 "  Current root is not booted."
+        dinitctl "$1" -o "$2"
+    else
+        dinitctl "$1" "$2"
+    fi
+}
+
+op="$1"; shift
+
+case $op in
+  enable) handle_user_spawn "$op" 'dinit-user-spawn' ;;
+  disable) handle_user_spawn "$op" 'dinit-user-spawn' ;;
+  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
+esac
+
+exit 0