Package: dpkg
Version: 1.10.28
Severity: minor
Tags: patch
'start-stop-daemon --help' does not output information about '-r' for chroot.
diff makes it do that, as well as makes --help's output, the getopt_long argc
string, and the order of operations in the case statement consistent with
the current standing order of options in the struct.
-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.6.8-2-xeon
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages dpkg depends on:
ii dselect 1.10.28 a user tool to manage Debian packa
ii libc6 2.3.2.ds1-22 GNU C Library: Shared libraries an
-- no debconf information
--- start-stop-daemon.c.orig 2006-03-01 10:23:52.000005000 -0500
+++ start-stop-daemon.c 2006-03-01 10:50:03.000005000 -0500
@@ -288,30 +288,31 @@
"Marek Michalkiewicz <[EMAIL PROTECTED]>, public domain.\n"
"\n"
"Usage:\n"
-" start-stop-daemon -S|--start options ... -- arguments ...\n"
-" start-stop-daemon -K|--stop options ...\n"
" start-stop-daemon -H|--help\n"
+" start-stop-daemon -K|--stop options ...\n"
+" start-stop-daemon -S|--start options ... -- arguments ...\n"
" start-stop-daemon -V|--version\n"
"\n"
"Options (at least one of --exec|--pidfile|--user is required):\n"
-" -x|--exec <executable> program to start/check if it is running\n"
+" -a|--startas <pathname> program to start (default is <executable>)\n"
+" -n|--name <process-name> stop processes with this name\n"
+" -o|--oknodo exit status 0 (not 1) if nothing done\n"
" -p|--pidfile <pid-file> pid file to check\n"
-" -c|--chuid <name|uid[:group|gid]>\n"
-" change to this user/group before starting process\n"
+" -q|--quiet be more quiet\n"
+" -s|--signal <signal> signal to send (default TERM)\n"
+" -t|--test test mode, don't do anything\n"
" -u|--user <username>|<uid> stop processes owned by this user\n"
" -g|--group <group|gid> run process as this group\n"
-" -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"
-" -d|--chdir <directory> Change to <directory>(default is /)\n"
+" -r|--chroot <directory> chroot to <directory> before starting\n"
+" -v|--verbose be more verbose\n"
+" -x|--exec <executable> program to start/check if it is running\n"
+" -c|--chuid <name|uid[:group|gid]>\n"
+" change to this user/group before starting process\n"
" -N|--nicelevel <incr> add incr to the process's nice level\n"
" -b|--background force the process to detach\n"
" -m|--make-pidfile create the pidfile before starting\n"
" -R|--retry <schedule> check whether processes die, and retry\n"
-" -t|--test test mode, don't do anything\n"
-" -o|--oknodo exit status 0 (not 1) if nothing done\n"
-" -q|--quiet be more quiet\n"
-" -v|--verbose be more verbose\n"
+" -d|--chdir <directory> change to <directory>(default is /)\n"
"Retry <schedule> is <item>|/<item>/... where <item> is one of\n"
" -<signal-num>|[-]<signal-name> send that signal\n"
" <timeout> wait that many seconds\n"
@@ -499,7 +500,7 @@
int c;
for (;;) {
- c = getopt_long(argc, argv,
"HKSVa:n:op:qr:s:tu:vx:c:N:bmR:g:d:",
+ c = getopt_long(argc, argv,
"HKSVa:n:op:qs:tu:g:r:vx:c:N:bmR:d:",
longopts, (int *) 0);
if (c == -1)
break;
@@ -540,6 +541,12 @@
case 'u': /* --user <username>|<uid> */
userspec = optarg;
break;
+ case 'g': /* --group <group>|<gid> */
+ changegroup = optarg;
+ break;
+ case 'r': /* --chroot /new/root */
+ changeroot = optarg;
+ break;
case 'v': /* --verbose */
quietmode = -1;
break;
@@ -553,12 +560,6 @@
changeuser = strtok(changeuser, ":");
changegroup = strtok(NULL, ":");
break;
- case 'g': /* --group <group>|<gid> */
- changegroup = optarg;
- break;
- case 'r': /* --chroot /new/root */
- changeroot = optarg;
- break;
case 'N': /* --nice */
nicelevel = atoi(optarg);
break;
