Add '-r' to the help output of start-stop-daemon (Jared Spiegel).

Closes: #354869

diff --git a/ChangeLog b/ChangeLog
index 0af650c41d89ce0971c395cb6a61f08e45b60a1a..43bff382ce449a16db04a02cb486ca3a4fe7f441 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-04  Jared Spiegel  <jrrs@frontiernet.net>
+
+       * utils/start-stop-daemon.c (do_help): Add '-r' option to the help
+       output.
+
 2006-04-04  Guillem Jover  <guillem@debian.org>
 
        * utils/start-stop-daemon.c (main): Prefix the chroot path, if any,

diff --git a/debian/changelog b/debian/changelog
index 7262d743fc58b0229e04f2968635dd1a009b5ba5..a93cdbf76fbfb4e8800439be6bddae6d035bc03c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ dpkg (1.13.18~) UNRELEASED; urgency=low
     Closes: #359935
   * Prefix any chroot path to the exec file name when stating it in
     start-stop-daemon. Closes: #318771, #333066
+  * Add '-r' to the help output of start-stop-daemon (Jared Spiegel).
+    Closes: #354869
 
  -- Christian Perrier <bubulle@debian.org>  Tue, 21 Mar 2006 20:46:24 +0100
 

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 3bfc03d95b4461ac5f0501b2bdf88927117ef8d4..73122d41df543d967b8c0a5a0cdf94e55402a286 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -301,6 +301,7 @@ do_help(void)
 "  -n|--name <process-name>      stop processes with this name\n"
 "  -s|--signal <signal>          signal to send (default TERM)\n"
 "  -a|--startas <pathname>       program to start (default is <executable>)\n"
+"  -r|--chroot <directory>       chroot to <directory> before starting\n"
 "  -d|--chdir <directory>        Change to <directory>(default is /)\n"
 "  -N|--nicelevel <incr>         add incr to the process's nice level\n"
 "  -b|--background               force the process to detach\n"