dh_installinit: never call init scripts directly, only through invoke-rc.d

diff --git a/autoscripts/postinst-init b/autoscripts/postinst-init
index 6a1c5727e14972f512b32b5d4141c625f2a9f0fe..2430b2c0fc41e33e7cd4111a1f0e39c9a0054404 100644 (file)
--- 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 ba4b3a026c014d2926a5779386192fbec66d3423..35bba207b33bf643ada9bc2c3e80e6e98691e8cb 100644 (file)
--- 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 96d37558e844932ef589e695b31115a402866408..2a8aa4c6cdd619a2aa52c6d83f6f3528590ff5ba 100644 (file)
--- 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 9b63174811895524939fe2edaa38c0e70488e4b3..cacde6e31c98e2c68d3a53717052230452a8a1c3 100644 (file)
--- 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