r542: * dh_installinit: Always start daemon on upgraded even if

[debhelper.git] / dh_installinit

diff --git a/dh_installinit b/dh_installinit
index 8af1751e7c0a059ca6e7bae338b783be91e40834..b20a1114780e66f2f06247b27d621d0fcd9b443d 100755 (executable)
--- a/dh_installinit
+++ b/dh_installinit
@@ -150,17 +150,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                addsubstvar($package, "misc:Depends", "sysvinit", ">= 2.80-1");
                                $substvaradded=1;
                        }
+                       autoscript($package,"postinst", "postinst-init$tailstr",
+                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
                        # -r on the command line sets R_FLAG. If it's set,
-                       # there  is no restart on upgrade.
+                       # there  is no restart on upgrade, so don't stop
+                       # daemon. (It's ok that it's always started.)
                        if ($dh{R_FLAG}) {
-                               autoscript($package,"postinst", "postinst-init-norestart$tailstr",
-                                       "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
                                autoscript($package,"prerm","prerm-init-norestart$tailstr",
                                        "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
                        }
                        else {
-                               autoscript($package,"postinst","postinst-init$tailstr",
-                                       "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
                                autoscript($package,"prerm","prerm-init$tailstr",
                                        "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
                        }