2 Commits
2.4 ... master

10 changed files with 40 additions and 38 deletions

View File

@@ -21,8 +21,10 @@ 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/*)
DINITCRONIEHOOKS = $(wildcard dinit/cronie-hooks/*)
DINITDBUSHOOKS = $(wildcard dinit/dbus-hooks/*)
@@ -78,8 +80,12 @@ 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_openrc_cronie: install_hook_common
install $(MODE) $(OPENRCCRONIEHOOKS) $(DESTDIR)$(HOOKSDIR)

View File

@@ -1,11 +0,0 @@
[Trigger]
Type = Path
Operation = Install
# Operation = Upgrade
Target = usr/lib/dinit.d/dinit-user-spawn
[Action]
Description = Enabling dinit user spawn ...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/dinit-hook userspawnE
NeedsTargets

View File

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

View File

@@ -7,5 +7,5 @@ Target = etc/dinit.d/user/*
[Action]
Description = Displaying dinit user service help ...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/dinit-hook addU
Exec = /usr/share/libalpm/scripts/dinit-user-hook addU
NeedsTargets

View File

@@ -6,5 +6,5 @@ Target = etc/dinit.d/user/*
[Action]
Description = Displaying dinit user service help ...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/dinit-hook delU
Exec = /usr/share/libalpm/scripts/dinit-user-hook delU
NeedsTargets

View File

@@ -54,15 +54,6 @@ restart_service() {
fi
}
handle_user_spawn() {
if [ ! -S /run/dinitctl ]; then
echo >&2 " Current root is not booted."
dinitctl "$1" -o dinit-user-spawn
else
dinitctl "$1" dinit-user-spawn
fi
}
op="$1"; shift
case $op in
@@ -75,8 +66,6 @@ case $op in
del) svc_del_help ;;
addU) svc_user_add_help ;;
delU) svc_user_del_help ;;
userspawnE) handle_user_spawn enable ;;
userspawnD) handle_user_spawn disable ;;
*) echo >&2 " Invalid operation '$op'"; exit 1 ;;
esac

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