summaryrefslogtreecommitdiff
path: root/autoscripts
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2011-01-17 01:52:12 -0800
committerJoey Hess <joey@kitenet.net>2011-01-25 16:00:19 -0400
commitab623d0bf8c2d59507f8e666253e316c76e2de90 (patch)
tree868bc80726dcf1f2d85c9b6893264d002698d757 /autoscripts
parentaefd7af18432d793f49bfebf02a0b69e278a57c9 (diff)
dh_installinit: never call init scripts directly, only through invoke-rc.d
Diffstat (limited to 'autoscripts')
-rw-r--r--autoscripts/postinst-init6
-rw-r--r--autoscripts/postinst-init-restart6
-rw-r--r--autoscripts/prerm-init6
-rw-r--r--autoscripts/prerm-init-norestart6
4 files changed, 4 insertions, 20 deletions
diff --git a/autoscripts/postinst-init b/autoscripts/postinst-init
index 6a1c572..2430b2c 100644
--- a/autoscripts/postinst-init
+++ b/autoscripts/postinst-init
@@ -1,8 +1,4 @@
if [ -x "/etc/init.d/#SCRIPT#" ]; then
update-rc.d #SCRIPT# #INITPARMS# >/dev/null
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#
- else
- /etc/init.d/#SCRIPT# start || #ERROR_HANDLER#
- fi
+ invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#
fi
diff --git a/autoscripts/postinst-init-restart b/autoscripts/postinst-init-restart
index ba4b3a0..35bba20 100644
--- a/autoscripts/postinst-init-restart
+++ b/autoscripts/postinst-init-restart
@@ -5,9 +5,5 @@ if [ -x "/etc/init.d/#SCRIPT#" ]; then
else
_dh_action=start
fi
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d #SCRIPT# $_dh_action || #ERROR_HANDLER#
- else
- /etc/init.d/#SCRIPT# $_dh_action || #ERROR_HANDLER#
- fi
+ invoke-rc.d #SCRIPT# $_dh_action || #ERROR_HANDLER#
fi
diff --git a/autoscripts/prerm-init b/autoscripts/prerm-init
index 96d3755..2a8aa4c 100644
--- a/autoscripts/prerm-init
+++ b/autoscripts/prerm-init
@@ -1,7 +1,3 @@
if [ -x "/etc/init.d/#SCRIPT#" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
- else
- /etc/init.d/#SCRIPT# stop || #ERROR_HANDLER#
- fi
+ invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
fi
diff --git a/autoscripts/prerm-init-norestart b/autoscripts/prerm-init-norestart
index 9b63174..cacde6e 100644
--- a/autoscripts/prerm-init-norestart
+++ b/autoscripts/prerm-init-norestart
@@ -1,7 +1,3 @@
if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
- else
- /etc/init.d/#SCRIPT# stop || #ERROR_HANDLER#
- fi
+ invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
fi