[Pkg-sysvinit-commits] r1229 - sysvinit/trunk/debian/patches

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-20 10:29:14 +0000 (Sun, 20 Jan 2008)
New Revision: 1229

Modified:
   sysvinit/trunk/debian/patches/00list
   sysvinit/trunk/debian/patches/83_killall_manref.dpatch
Log:
Improve manual patch.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2008-01-20 10:23:58 UTC (rev 1228)
+++ sysvinit/trunk/debian/patches/00list	2008-01-20 10:29:14 UTC (rev 1229)
@@ -37,7 +37,7 @@
 81_killall_avoid_init
 82_killall_retval
 82_killall_exclude_pids
-#83_killall_manref
+83_killall_manref
 90_shutdown_H
 91_sulogin_lockedpw
 92_sata-hddown

Modified: sysvinit/trunk/debian/patches/83_killall_manref.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/83_killall_manref.dpatch	2008-01-20 10:23:58 UTC (rev 1228)
+++ sysvinit/trunk/debian/patches/83_killall_manref.dpatch	2008-01-20 10:29:14 UTC (rev 1229)
@@ -5,31 +5,69 @@
 killall5(8) (Closes: #461160).
  
 @DPATCH@
-Index: sysvinit/man/killall5.8
-===================================================================
---- sysvinit/man/killall5.8	(revision 1216)
-+++ sysvinit/man/killall5.8	(working copy)
-@@ -10,8 +10,12 @@
- kernel threads and the processes in its own session, so it won't kill
- the shell that is running the script it was called from. Its primary
- (only) use is in the \fBrc\fP scripts found in the /etc/init.d directory.
+diff -urNad trunk~/man/killall5.8 trunk/man/killall5.8
+--- trunk~/man/killall5.8	2008-01-20 11:24:23.000000000 +0100
++++ trunk/man/killall5.8	2008-01-20 11:25:37.000000000 +0100
+@@ -17,12 +17,16 @@
+ .SH OPTIONS
+ .IP "-o \fIomitpid\fP"
+ Tells \fIkillall5\fP to omit processes with that process id.
 +.SH NOTES
 +\fIkillall5\fP can also be invoked as pidof, which is simply a
 +(symbolic) link to the \fIkillall5\fP program.
+ .SH EXIT STATUS
+ The program return zero if it killed processes.  It return 2 if no
+ process were killed, and 1 if it was unable to find any processes
+ (/proc/ is missing).
  .SH SEE ALSO
  .BR halt (8),
- .BR reboot (8)
+-.BR reboot (8)
++.BR reboot (8),
 +.BR pidof (8)
  .SH AUTHOR
  Miquel van Smoorenburg, miquels at cistron.nl
-Index: man/pidof.8
-===================================================================
---- sysvinit/man/pidof.8	(revision 1216)
-+++ sysvinit/man/pidof.8	(working copy)
-@@ -44,5 +44,6 @@
+diff -urNad trunk~/man/killall5.8.rej trunk/man/killall5.8.rej
+--- trunk~/man/killall5.8.rej	2008-01-20 11:22:27.000000000 +0100
++++ trunk/man/killall5.8.rej	2008-01-20 11:24:23.000000000 +0100
+@@ -1,23 +1,23 @@
+ ***************
+-*** 10,21 ****
++*** 10,17 ****
+   kernel threads and the processes in its own session, so it won't kill
+   the shell that is running the script it was called from. Its primary
+   (only) use is in the \fBrc\fP scripts found in the /etc/init.d directory.
+-- .SH NOTES
+-- \fIkillall5\fP can also be invoked as pidof, which is simply a
+-- (symbolic) link to the \fIkillall5\fP program.
+   .SH SEE ALSO
+   .BR halt (8),
+   .BR reboot (8)
+-- .BR pidof (8)
+   .SH AUTHOR
+   Miquel van Smoorenburg, miquels at cistron.nl
+---- 10,17 ----
++--- 10,21 ----
+   kernel threads and the processes in its own session, so it won't kill
+   the shell that is running the script it was called from. Its primary
+   (only) use is in the \fBrc\fP scripts found in the /etc/init.d directory.
+++ .SH NOTES
+++ \fIkillall5\fP can also be invoked as pidof, which is simply a
+++ (symbolic) link to the \fIkillall5\fP program.
+   .SH SEE ALSO
+   .BR halt (8),
+   .BR reboot (8)
+++ .BR pidof (8)
+   .SH AUTHOR
+   Miquel van Smoorenburg, miquels at cistron.nl
+diff -urNad trunk~/man/pidof.8 trunk/man/pidof.8
+--- trunk~/man/pidof.8	2008-01-20 11:24:23.000000000 +0100
++++ trunk/man/pidof.8	2008-01-20 11:25:44.000000000 +0100
+@@ -50,6 +50,7 @@
+ .BR shutdown (8),
  .BR init (8),
  .BR halt (8),
- .BR reboot (8)
+-.BR reboot (8)
++.BR reboot (8),
 +.BR killall5 (8)
  .SH AUTHOR
  Miquel van Smoorenburg, miquels at cistron.nl