Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_installinit

diff --git a/dh_installinit b/dh_installinit
index 360f378397176f34fe749c94b351ce8a41e2edc7..7dde36316574e2754f335309655fda6ef469a697 100755 (executable)
--- a/dh_installinit
+++ b/dh_installinit
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-r>] [B<-d>] [S<B<--> I<params>>]
+B<dh_installinit> [S<I<debhelper options>>] [B<--name=>I<name>] [B<-n>] [B<-R>] [B<-r>] [B<-d>] [S<B<--> I<params>>]
 
 =head1 DESCRIPTION
 
@@ -38,9 +38,27 @@ by the package name.
 
 Do not modify postinst/postrm/prerm scripts.
 
+=item B<-o>, B<--onlyscripts>
+
+Only modify postinst/postrm/prerm scripts, do not actually install any init
+script or default files. May be useful if the init script is shipped and/or
+installed by upstream in a way that doesn't make it easy to let
+dh_installinit find it.
+
+=item B<-R>, B<--restart-after-upgrade>
+
+Do not stop the init script until after the package upgrade has been
+completed. This is different than the default behavior, which stops the
+script in the prerm, and starts it again in the postinst.
+
+This can be useful for daemons that should not have a possibly long
+downtime during upgrade. But you should make sure that the daemon will not
+get confused by the package being upgraded while it's running before using
+this option.
+
 =item B<-r>, B<--no-restart-on-upgrade>
 
-Do not restart init script on upgrade.
+Do not stop init script on upgrade.
 
 =item B<--no-start>
 
@@ -81,11 +99,17 @@ preference to the files it normally installs.
 
 This parameter is deprecated, use the --name parameter instead.
 
+=item B<--error-handler=>I<function>
+
+Call the named shell function if running the init script fails. The
+function should be provided in the prerm and postinst scripts, before the
+#DEBHELPER# token.
+
 =back
 
 =head1 NOTES
 
-Note that this command is not idempotent. "dh_clean -k" should be called
+Note that this command is not idempotent. L<dh_prep(1)> should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 
@@ -124,20 +148,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
              pkgfile($package,"init.d");
        my $default=pkgfile($package,'default');
 
-       if ($default ne '') {
+       if ($default ne '' && ! $dh{ONLYSCRIPTS}) {
                if (! -d "$tmp/etc/default") {
                        doit("install","-d","$tmp/etc/default");
                }
                doit("install","-p","-m644",$default,"$tmp/etc/default/$script");
        }
 
-       if ($init ne '') {
-               if (! -d "$tmp/etc/init.d") {
-                       doit("install","-d","$tmp/etc/init.d");
+       if ($init ne '' || $dh{ONLYSCRIPTS}) {
+               if (! $dh{ONLYSCRIPTS}) {
+                       if (! -d "$tmp/etc/init.d") {
+                               doit("install","-d","$tmp/etc/init.d");
+                       }
+               
+                       doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script");
                }
-
-               doit("install","-p","-m755",$init,"$tmp/etc/init.d/$script");
-
+               
                # This is set by the -u "foo" command line switch, it's
                # the parameters to pass to update-rc.d. If not set,
                # we have to say "defaults".
@@ -148,33 +174,41 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if ($params eq '') {
                        $params="defaults";
                }
-
+                
                if (! $dh{NOSCRIPTS}) {
                        if (! $dh{NO_START}) {
-                               # update-rc.d, and start script
-                               autoscript($package,"postinst", "postinst-init",
-                                       "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
+                               if ($dh{RESTART_AFTER_UPGRADE}) {
+                                       # update-rc.d, and restart (or
+                                       # start if new install) script
+                                       autoscript($package,"postinst", "postinst-init-restart",
+                                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+                               }
+                               else {
+                                       # update-rc.d, and start script
+                                       autoscript($package,"postinst", "postinst-init",
+                                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+                               }
                        
-                               if ($dh{R_FLAG}) {
+                               if ($dh{R_FLAG} || $dh{RESTART_AFTER_UPGRADE}) {
                                        # stops script only on remove
                                        autoscript($package,"prerm","prerm-init-norestart",
-                                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
+                                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
                                }
                                else {
                                        # always stops script
                                        autoscript($package,"prerm","prerm-init",
-                                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
+                                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
                                }
                        }
                        else {
                                # just update-rc.d
                                autoscript($package,"postinst", "postinst-init-nostart",
-                                       "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
+                                       "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
                        }
 
                        # removes rc.d links
                        autoscript($package,"postrm","postrm-init",
-                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/");
+                               "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
                }
        }
 }