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

     --no-restart-on-upgrade is given; since the daemon is not stopped
     with that parameter starting it again is a no-op, unless the daemon was
     not running for some reason. This makes transtions to using the flag
     easier. Closes: #90976 and sorry it took me so long to verify you were
     right.

1 files changed, 4 insertions, 5 deletions

diff --git a/dh_installinit b/dh_installinit
index 8af1751e..b20a1114 100755
--- 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/");
 			}