diff options
| author | Niels Thykier <niels@thykier.net> | 2018-05-13 15:17:39 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2018-09-03 06:01:42 +0000 |
| commit | cba2a8a6ea64773e61ab41c218853ee729656650 (patch) | |
| tree | 6904f58c627cf781697121efa9e4cf6c52ef5d11 /autoscripts | |
| parent | 5d097054219ffb4efdeb946a4ffa59caeb15511c (diff) | |
| download | debhelper-cba2a8a6ea64773e61ab41c218853ee729656650.tar.gz | |
Make dh_install{init,systemd}'s autoscripts independent [c12]
Have dh_installinit use the new --skip-systemd-native parameter and
let dh_installsystemd always generate autoscript snippets for systemd
services.
This ensures that dh_installsystemd's snippet will be used for
starting the services and will among other ensure that services
are properly unmasked before started.
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'autoscripts')
| -rw-r--r-- | autoscripts/postinst-init | 2 | ||||
| -rw-r--r-- | autoscripts/postinst-init-restart | 2 | ||||
| -rw-r--r-- | autoscripts/prerm-init | 2 | ||||
| -rw-r--r-- | autoscripts/prerm-init-norestart | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/autoscripts/postinst-init b/autoscripts/postinst-init index 0cf40857..535b40c3 100644 --- a/autoscripts/postinst-init +++ b/autoscripts/postinst-init @@ -1,6 +1,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then if [ -x "/etc/init.d/#SCRIPT#" ]; then update-rc.d #SCRIPT# #INITPARMS# >/dev/null - invoke-rc.d #SCRIPT# start || #ERROR_HANDLER# + invoke-rc.d #INVOKE_RCD_PARAMS##SCRIPT# start || #ERROR_HANDLER# fi fi diff --git a/autoscripts/postinst-init-restart b/autoscripts/postinst-init-restart index 3eadaf67..19dff68a 100644 --- a/autoscripts/postinst-init-restart +++ b/autoscripts/postinst-init-restart @@ -6,6 +6,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-decon else _dh_action=start fi - invoke-rc.d #SCRIPT# $_dh_action || #ERROR_HANDLER# + invoke-rc.d #INVOKE_RCD_PARAMS##SCRIPT# $_dh_action || #ERROR_HANDLER# fi fi diff --git a/autoscripts/prerm-init b/autoscripts/prerm-init index 2a8aa4c6..f8707b9c 100644 --- a/autoscripts/prerm-init +++ b/autoscripts/prerm-init @@ -1,3 +1,3 @@ if [ -x "/etc/init.d/#SCRIPT#" ]; then - invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER# + invoke-rc.d #INVOKE_RCD_PARAMS##SCRIPT# stop || #ERROR_HANDLER# fi diff --git a/autoscripts/prerm-init-norestart b/autoscripts/prerm-init-norestart index cacde6e3..97f2174a 100644 --- a/autoscripts/prerm-init-norestart +++ b/autoscripts/prerm-init-norestart @@ -1,3 +1,3 @@ if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then - invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER# + invoke-rc.d #INVOKE_RCD_PARAMS##SCRIPT# stop || #ERROR_HANDLER# fi |