9 Commits
2.2 ... 2.4.4

11 changed files with 121 additions and 7 deletions

View File

@@ -21,8 +21,13 @@ S6CRONIEHOOKS = $(wildcard s6/cronie-hooks/*)
S6DBUSHOOKS = $(wildcard s6/dbus-hooks/*)
S6ATDHOOKS = $(wildcard s6/atd-hooks/*)
DINITSCRIPTS = $(wildcard dinit/scripts/*)
DINITHOOKS = $(wildcard dinit/hooks/*)
DINITSYSTEMSCRIPTS = $(wildcard dinit/scripts/system/*)
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/*)
@@ -78,8 +83,16 @@ install_s6: install_common
install $(MODE) $(S6HOOKS) $(DESTDIR)$(HOOKSDIR)
install_dinit: install_common
install $(EMODE) $(DINITSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
install $(MODE) $(DINITHOOKS) $(DESTDIR)$(HOOKSDIR)
install $(EMODE) $(DINITSYSTEMSCRIPTS) $(DESTDIR)$(SCRIPTSDIR)
install $(MODE) $(DINITSYSTEMHOOKS) $(DESTDIR)$(HOOKSDIR)
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)
@@ -112,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

View File

@@ -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

View File

@@ -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

View File

@@ -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-user-hook addU
NeedsTargets

View File

@@ -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-user-hook delU
NeedsTargets

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1,28 @@
#!/bin/sh -e
svc_help(){
echo " ==> Start/stop/restart a service:"
echo " dinitctl <start/stop/restart> <service>"
}
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
}
op="$1"; shift
case $op in
addU) svc_user_add_help ;;
delU) svc_user_del_help ;;
*) echo >&2 " Invalid operation '$op'"; exit 1 ;;
esac
exit 0