[Debian-live-changes] r1550 - in dists/trunk/live-initramfs: docs manpages scripts scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-18 11:42:37 +0000 (Fri, 18 May 2007)
New Revision: 1550

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/manpages/live-initramfs.en.7
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 11:27:31 UTC (rev 1549)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 11:42:37 UTC (rev 1550)
@@ -7,6 +7,9 @@
 	* scripts/live, scripts/live-bottom/15adduser:
 	  - Added check for 'noxautologin' bootparameter to disable automatic
 	    gdm/kdm login.
+	* scripts/live, scripts/live-bottom/25configure_init:
+	  - Added check for 'noautologin' bootparameter to disable automatic
+	    terminal login.
 
 2007-06-12  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-18 11:27:31 UTC (rev 1549)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-18 11:42:37 UTC (rev 1550)
@@ -56,8 +56,10 @@
 This parameter will make live\-initramfs to show on "/" the ro filesystems (mostly compressed) on "/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation.
 .IP "\fBnoswap\fR" 4
 This parameter disables usage of local swap partitions.
+.IP "\fBnoautologin\fR" 4
+This parameter disables the automatic terminal login only, not touching gdk/kdm.
 .IP "\fBnoxautologin\fR" 4
-This parameter disables the automatic login of gdm/kdm.
+This parameter disables the automatic login of gdm/kdm only, not touching terminals.
 .IP "\fBtodisk=\fR\fIDEVICE" 4
 Adding this parameter, live\-initramfs will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live\-media=DEVICE" boot parameter with the same DEVICE used this time.
 .IP "\fBtoram\fR" 4

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-18 11:27:31 UTC (rev 1549)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-18 11:42:37 UTC (rev 1550)
@@ -62,6 +62,8 @@
                 export TODISK=${x#todisk=} ;;
 	    noswap)
 	        export NOSWAP="Yes" ;;
+	    noautologin)
+	    	export NOAUTOLOGIN="Yes" ;;
 	    noxautologin)
 	    	export NOXAUTOLOGIN="Yes" ;;
             showmounts)

Modified: dists/trunk/live-initramfs/scripts/live-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/25configure_init	2007-05-18 11:27:31 UTC (rev 1549)
+++ dists/trunk/live-initramfs/scripts/live-bottom/25configure_init	2007-05-18 11:42:37 UTC (rev 1550)
@@ -28,6 +28,9 @@
 
 # Arrange for shells on virtual consoles, rather than login prompts
 
+if [ -z "${NOAUTOLOGIN}" ]
+then
+
 if [ -n "$USERNAME" ]; then
     if [ ! -z "${LIVE_GETTY}" ]; then
        if echo "${DEFCONSOLE}" | grep -qs ttyS; then
@@ -67,6 +70,8 @@
      fi
 fi
 
+fi
+
 # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
 # /etc/crontab remaining disabled, yet also not run by anacron
 if [ -x /root/etc/init.d/anacron ]; then