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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-08 15:19:42 +0000 (Wed, 08 Jul 2009)
New Revision: 1385

Added:
   sysvinit/trunk/debian/patches/95_halt-name.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
New patch 95_halt-name fixing halt/reboot to work properly when used
as login shells.  Dale R. Worley and Fedora.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-08 15:03:39 UTC (rev 1384)
+++ sysvinit/trunk/debian/changelog	2009-07-08 15:19:42 UTC (rev 1385)
@@ -42,6 +42,8 @@
     Thomas Woerner and Fedora.
   * New patch 70_init_consoleopen to give missing console some time to
     show up. Patch from Bill Nottingham and Fedora.
+  * New patch 95_halt-name fixing halt/reboot to work properly when used
+    as login shells.  Dale R. Worley and Fedora.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 Jul 2009 20:04:20 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-08 15:03:39 UTC (rev 1384)
+++ sysvinit/trunk/debian/patches/00list	2009-07-08 15:19:42 UTC (rev 1385)
@@ -50,3 +50,4 @@
 92_sata-hddown
 93_sulogin_fallback
 94_fstab-decode
+95_halt-name

Added: sysvinit/trunk/debian/patches/95_halt-name.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/95_halt-name.dpatch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/95_halt-name.dpatch	2009-07-08 15:19:42 UTC (rev 1385)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95_halt-name.dpatch by Dale R. Worley and Fedora.
+
+Fix halt when used as login shell.  ARGV[0] is -halt or -reboot in
+this case.  See
+<URL:https://bugzilla.redhat.com/show_bug.cgi?id=104062> for the
+details.
+
+ at DPATCH@
+--- sysvinit-2.86/src/halt.c.foo	2005-12-20 15:09:35.000000000 -0500
++++ sysvinit-2.86/src/halt.c	2005-12-20 15:09:25.000000000 -0500
+@@ -178,6 +178,7 @@
+ 	/*
+ 	 *	Find out who we are
+ 	 */
++	if (argv[0][0] == '-') argv[0]++;
+ 	if ((progname = strrchr(argv[0], '/')) != NULL)
+ 		progname++;
+ 	else


Property changes on: sysvinit/trunk/debian/patches/95_halt-name.dpatch
___________________________________________________________________
Added: svn:executable
   + *