diff -Nru sysvinit-2.87dsf/debian/changelog sysvinit-2.87dsf/debian/changelog --- sysvinit-2.87dsf/debian/changelog 2009-12-01 00:36:50.000000000 +0100 +++ sysvinit-2.87dsf/debian/changelog 2010-01-18 09:45:12.000000000 +0100 @@ -1,3 +1,11 @@ +sysvinit (2.87dsf-4ubuntu14) lucid; urgency=low + + * 92_sulogin_support_static_sh.patch: + - add support for /bin/static-sh as fallback if the regular + shell fails to execute + + -- Michael Vogt Mon, 18 Jan 2010 09:40:46 +0100 + sysvinit (2.87dsf-4ubuntu13) lucid; urgency=low * debian/initscripts/etc/init.d/sendsigs: diff -Nru sysvinit-2.87dsf/debian/patches/92_sulogin_support_static_sh.patch sysvinit-2.87dsf/debian/patches/92_sulogin_support_static_sh.patch --- sysvinit-2.87dsf/debian/patches/92_sulogin_support_static_sh.patch 1970-01-01 01:00:00.000000000 +0100 +++ sysvinit-2.87dsf/debian/patches/92_sulogin_support_static_sh.patch 2010-01-18 09:44:14.000000000 +0100 @@ -0,0 +1,26 @@ +Index: sysvinit-2.87dsf/src/sulogin.c +=================================================================== +--- sysvinit-2.87dsf.orig/src/sulogin.c 2010-01-18 09:41:41.012271775 +0100 ++++ sysvinit-2.87dsf/src/sulogin.c 2010-01-18 09:44:01.902272010 +0100 +@@ -40,7 +40,8 @@ + #define F_PASSWD "/etc/passwd" + #define F_SHADOW "/etc/shadow" + #define BINSH "/bin/sh" +-#define STATICSH "/bin/sash" ++#define STATICSH "/bin/static-sh" ++#define STATICSH_SASH "/bin/sash" + + char *Version = "@(#)sulogin 2.85-3 23-Apr-2003 miquels@cistron.nl"; + +@@ -373,6 +374,11 @@ + setenv("SHELL", STATICSH, 1); + execl(STATICSH, STATICSH, NULL); + perror(STATICSH); ++ ++ /* Fall back to sash */ ++ setenv("SHELL", STATICSH_SASH, 1); ++ execl(STATICSH_SASH, STATICSH_SASH, NULL); ++ perror(STATICSH_SASH); + } + + void usage(void) diff -Nru sysvinit-2.87dsf/debian/patches/series sysvinit-2.87dsf/debian/patches/series --- sysvinit-2.87dsf/debian/patches/series 2009-09-07 20:58:36.000000000 +0200 +++ sysvinit-2.87dsf/debian/patches/series 2010-01-18 09:41:28.000000000 +0100 @@ -9,6 +9,7 @@ 62_init_freebsdterm.dpatch 70_compiler_warnings.dpatch 91_sulogin_lockedpw.dpatch +92_sulogin_support_static_sh.patch 94_fstab-decode.dpatch 96_shutdown_acctoff.dpatch 97_init_starttest.dpatch