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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-30 09:01:39 +0000 (Wed, 30 Sep 2009)
New Revision: 1789

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
Log:
Update 91_sulogin_lockedpw.dpatch to include documentation,
without the Ubuntu references.  Based on patch from Scott James
Remnant and Ubuntu.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-30 08:43:16 UTC (rev 1788)
+++ sysvinit/trunk/debian/changelog	2009-09-30 09:01:39 UTC (rev 1789)
@@ -17,6 +17,9 @@
     before /usr/ is guaranteed to be available.
   * Rewrite /lib/init/usplash-fsck-functions.sh to use blkid instead of
     the now obsolete vol_id.  Patch from Martin Pitt and Ubuntu.
+  * Update 91_sulogin_lockedpw.dpatch to include documentation,
+    without the Ubuntu references.  Based on patch from Scott James
+    Remnant and Ubuntu.
 
   [ Henrique de Moraes Holschuh ]
   * invoke-rc.d: return exit status 4 when action "status" is denied,

Modified: sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch	2009-09-30 08:43:16 UTC (rev 1788)
+++ sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch	2009-09-30 09:01:39 UTC (rev 1789)
@@ -5,8 +5,10 @@
 Fixes:   #326678
 Status:  unknown
 
---- a/src/sulogin.c
-+++ b/src/sulogin.c
+Index: trunk/src/sulogin.c
+===================================================================
+--- trunk.orig/src/sulogin.c	2009-09-30 10:59:13.000000000 +0200
++++ trunk/src/sulogin.c	2009-09-30 10:59:13.000000000 +0200
 @@ -241,7 +241,11 @@
  		fprintf(stderr, "%s: no entry for root\n", F_SHADOW);
  		strcpy(pwd.pw_passwd, "");
@@ -35,3 +37,17 @@
  
  	/*
  	 *	Ask for the password.
+Index: trunk/man/sulogin.8
+===================================================================
+--- trunk.orig/man/sulogin.8	2009-07-24 11:49:26.000000000 +0200
++++ trunk/man/sulogin.8	2009-09-30 10:59:49.000000000 +0200
+@@ -22,6 +22,9 @@
+ .br
+ (or type Control\-D for normal startup):
+ .PP
++If the root account is locked, no password prompt is displayed and
++\fIsulogin\fR behaves as if the correct password were entered.
++.PP
+ \fIsulogin\fP will be connected to the current terminal, or to the
+ optional device that can be specified on the command line
+ (typically \fB/dev/console\fP).