[Pkg-sysvinit-commits] r1524 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 14:11:49 +0000 (Fri, 24 Jul 2009)
New Revision: 1524

Removed:
   sysvinit/trunk/debian/patches/82_killall_retval.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
Drop patch 82_killall_retval now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:59:05 UTC (rev 1523)
+++ sysvinit/trunk/debian/changelog	2009-07-24 14:11:49 UTC (rev 1524)
@@ -39,6 +39,7 @@
     - Drop patch 80_killall_sched now included upstream.
     - Drop patch 81_killall_avoid_init now included upstream.
     - Drop patch 82_killall_exclude_pids now included upstream.
+    - Drop patch 82_killall_retval now included upstream.
 
   * XXX Need to remove debian patches now included in the new upstream release.
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:59:05 UTC (rev 1523)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 14:11:49 UTC (rev 1524)
@@ -9,7 +9,6 @@
 54_bootlogd_findptyfail
 62_init_freebsdterm
 #68_init_quiet
-##82_killall_retval
 ##83_killall_manref
 ##84_killall_fuse
 ##85_killall_safecwd

Deleted: sysvinit/trunk/debian/patches/82_killall_retval.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/82_killall_retval.dpatch	2009-07-24 13:59:05 UTC (rev 1523)
+++ sysvinit/trunk/debian/patches/82_killall_retval.dpatch	2009-07-24 14:11:49 UTC (rev 1524)
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 82_killall_retval.dpatch by Petter Reinholdtsen
-
-Modify killall5 to make it report if it found any processes to kill.
-This make it possible to avoid sleeping for 5 seconds during shutdown
-if there are no processes left to wait for.
- 
- at DPATCH@
-diff -urNad trunk~/man/killall5.8 trunk/man/killall5.8
---- trunk~/man/killall5.8	2008-03-26 09:30:38.000000000 +0100
-+++ trunk/man/killall5.8	2008-03-26 09:31:29.000000000 +0100
-@@ -10,6 +10,10 @@
- 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 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)
-diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
---- trunk~/src/killall5.c	2008-03-26 09:31:28.000000000 +0100
-+++ trunk/src/killall5.c	2008-03-26 09:31:29.000000000 +0100
-@@ -590,6 +590,9 @@
- 	int		pid, sid = -1;
- 	int		sig = SIGKILL;
- 
-+	/* return non-zero if no process was killed */
-+	int		retval = 2;
-+
- 	/* Get program name. */
- 	if ((progname = strrchr(argv[0], '/')) == NULL)
- 		progname = argv[0];
-@@ -630,15 +633,17 @@
- 	/* Read /proc filesystem */
- 	if (readproc() < 0) {
- 		kill(-1, SIGCONT);
--		exit(1);
-+		return(1);
- 	}
- 
- 	/* Now kill all processes except init (pid 1) and our session. */
- 	sid = (int)getsid(0);
- 	pid = (int)getpid();
- 	for (p = plist; p; p = p->next)
--		if (p->pid != 1 && p->pid != pid && p->sid != sid && !p->kernel)
-+		if (p->pid != 1 && p->pid != pid && p->sid != sid && !p->kernel) {
- 			kill(p->pid, sig);
-+			retval = 0;
-+		}
- 
- 	/* And let them continue. */
- 	kill(-1, SIGCONT);
-@@ -649,5 +654,5 @@
- 	/* Force the kernel to run the scheduler */
- 	usleep(1);
- 
--	return 0;
-+	return retval;
- }