dinit: support user services with dinit-uuser-spawn

dinit/hooks/dinit-user-install.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = etc/dinit.d/user/*
+
+[Action]
+Description = Displaying dinit user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-hook addU
+NeedsTargets

dinit/hooks/dinit-user-remove.hook

@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Remove
+Target = etc/dinit.d/user/*
+
+[Action]
+Description = Displaying dinit user service help ...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/dinit-hook delU
+NeedsTargets

dinit/scripts/dinit-hook

@@ -14,13 +14,25 @@ svc_help(){
 
 svc_add_help(){
     echo "	==> Add a service:"
-    echo "	dinitctl enable <service>"
+    echo "	# dinitctl enable <service>"
     svc_help
 }
 
 svc_del_help(){
     echo "	==> Remove a service:"
-    echo "	dinitctl disable <service>"
+    echo "	# dinitctl disable <service>"
+    svc_help
+}
+
+svc_user_add_help(){
+    echo "	==> Add a user service:"
+    echo "	$ dinitctl enable <service>"
+    svc_help
+}
+
+svc_user_del_help(){
+    echo "	==> Remove a user service:"
+    echo "	$ dinitctl disable <service>"
     svc_help
 }
 
@@ -52,6 +64,8 @@ case $op in
   restart)  dinit_live; restart_service "$1" ;;
   add)      svc_add_help ;;
   del)      svc_del_help ;;
+  addU)      svc_user_add_help ;;
+  delU)      svc_user_del_help ;;
   *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 

openrc/scripts/openrc-hook

@@ -7,38 +7,45 @@ openrc_live() {
     fi
 }
 
+each_conf() {
+    while read -r f; do
+        "$@" "/$f"
+    done
+}
+
 svc_help(){
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Start/stop/restart a $str service:"
+    else
         echo "	==> Start/stop/restart a service:"
-    echo "	rc-service <service> <start/stop/restart>"
+    fi
+    echo "	rc-service <service> <start/stop/restart>" "$arg"
 }
 
 svc_add_help(){
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Add a $str service to runlevel:"
+    else
         echo "	==> Add a service to runlevel:"
-    echo "	rc-update add <service> <runlevel>"
+    fi
-    svc_help
+    echo "	rc-update add <service> <runlevel>" "$arg"
+    svc_help "$arg"
 }
 
 svc_del_help(){
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Remove a $str service from runlevel:"
+    else
         echo "	==> Remove a service from runlevel:"
-    echo "	rc-update del <service> <runlevel>"
+    fi
-    svc_help
+    echo "	rc-update del <service> <runlevel>" "$arg"
-}
+    svc_help "$arg"
-
-svc_user_help(){
-    echo "	==> Start/stop/restart a service:"
-    echo "	rc-service -U <service> <start/stop/restart>"
-}
-
-svc_user_add_help(){
-    echo "	==> Add a user service to runlevel:"
-    echo "	rc-update -U add <service> <runlevel>"
-    svc_help
-}
-
-svc_user_del_help(){
-    echo "	==> Remove a user service from runlevel:"
-    echo "	rc-update -U del <service> <runlevel>"
-    svc_help
 }
 
 svc_user_ln() {
@@ -55,12 +62,6 @@ svc_user_ln() {
     done
 }
 
-each_conf() {
-  while read -r f; do
-    "$@" "/$f"
-  done
-}
-
 op="$1"; shift
 
 case $op in
@@ -71,8 +72,8 @@ case $op in
     reload) openrc_live; /usr/bin/rc-service "$@" reload ;;
     add) svc_add_help ;;
     del) svc_del_help ;;
-  uadd) svc_user_add_help ;;
+    uadd) svc_add_help "--user" ;;
-  udel) svc_user_del_help ;;
+    udel) svc_del_help "--user" ;;
     *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac