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

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-20 10:23:58 +0000 (Sun, 20 Jan 2008)
New Revision: 1228

Added:
   sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/patches/00list
Log:
  * New patch 93_sulogin_fallback to let sulogin fall back to the
    staticly linked /bin/sash if both roots shell and /bin/sh fail to
    execute.  Add suggests for sysvinit-utils to sah, for those that
    want this extra level of redundancy (Closes #43317).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-20 10:07:37 UTC (rev 1227)
+++ sysvinit/trunk/debian/changelog	2008-01-20 10:23:58 UTC (rev 1228)
@@ -7,6 +7,10 @@
     pidof, and mention pidof in killall5(8) (Closes: #461160).
   * Improve documentation for the CONCURRENCY option in /etc/init.d/rc
     (Closes: #408491).
+  * New patch 93_sulogin_fallback to let sulogin fall back to the
+    staticly linked /bin/sash if both roots shell and /bin/sh fail to
+    execute.  Add suggests for sysvinit-utils to sah, for those that
+    want this extra level of redundancy (Closes #43317).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 20 Jan 2008 10:28:07 +0100
 

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2008-01-20 10:07:37 UTC (rev 1227)
+++ sysvinit/trunk/debian/control	2008-01-20 10:23:58 UTC (rev 1228)
@@ -28,6 +28,7 @@
 Conflicts: last
 Replaces: last, sysvinit (<= 2.86.ds1-22)
 Depends: ${shlibs:Depends}
+Suggests: sash
 Description: System-V-like utilities
  This package contains the important System-V-like utilities.
  .

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2008-01-20 10:07:37 UTC (rev 1227)
+++ sysvinit/trunk/debian/patches/00list	2008-01-20 10:23:58 UTC (rev 1228)
@@ -37,7 +37,8 @@
 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
+93_sulogin_fallback

Added: sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch	2008-01-20 10:23:58 UTC (rev 1228)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_sulogin_fallback.dpatch by Petter Reinholdtsen
+
+Let sulogin fall back to the staticly linked /bin/sash if both roots
+shell and /bin/sh fail to execute.  Add suggests for sysvinit-utils to
+sah, for those that want this extra level of redundancy (Closes
+#43317).
+
+ at DPATCH@
+Index: sysvinit/src/sulogin.c
+===================================================================
+--- sysvinit/src/sulogin.c	(revision 1227)
++++ sysvinit/src/sulogin.c	(working copy)
+@@ -34,6 +34,7 @@
+ #define F_PASSWD	"/etc/passwd"
+ #define F_SHADOW	"/etc/shadow"
+ #define BINSH		"/bin/sh"
++#define STATICSH	"/bin/sash"
+ 
+ char *Version = "@(#)sulogin 2.85-3 23-Apr-2003 miquels at cistron.nl";
+ 
+@@ -341,6 +342,12 @@
+ 	setenv("SHELL", BINSH, 1);
+ 	execl(BINSH, profile ? "-sh" : "sh", NULL);
+ 	perror(BINSH);
++
++	/* Fall back to staticly linked shell if both the users shell
++	   and /bin/sh failed to execute. */
++	setenv("SHELL", STATICSH, 1);
++	execl(STATICSH, STATICSH, NULL);
++	perror(STATICSH);
+ }
+ 
+ void usage(void)