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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-18 11:27:31 +0000 (Fri, 18 May 2007)
New Revision: 1549

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/15autologin
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 11:23:15 UTC (rev 1548)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 11:27:31 UTC (rev 1549)
@@ -4,6 +4,9 @@
 	  - Replaced 'mount -o move' with 'mount --move'.
 	* scripts/live, scripts/live-bottom/13swap:
 	  - Renamed 'swapoff' parameter to 'noswap'.
+	* scripts/live, scripts/live-bottom/15adduser:
+	  - Added check for 'noxautologin' bootparameter to disable automatic
+	    gdm/kdm 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:23:15 UTC (rev 1548)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-18 11:27:31 UTC (rev 1549)
@@ -56,6 +56,8 @@
 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 "\fBnoxautologin\fR" 4
+This parameter disables the automatic login of gdm/kdm.
 .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:23:15 UTC (rev 1548)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-18 11:27:31 UTC (rev 1549)
@@ -62,6 +62,8 @@
                 export TODISK=${x#todisk=} ;;
 	    noswap)
 	        export NOSWAP="Yes" ;;
+	    noxautologin)
+	    	export NOXAUTOLOGIN="Yes" ;;
             showmounts)
                 export SHOWMOUNTS="Yes" ;;
             persistent)

Modified: dists/trunk/live-initramfs/scripts/live-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/15autologin	2007-05-18 11:23:15 UTC (rev 1548)
+++ dists/trunk/live-initramfs/scripts/live-bottom/15autologin	2007-05-18 11:27:31 UTC (rev 1549)
@@ -26,6 +26,9 @@
 
 # live-initramfs script
 
+if [ -z "${NOXAUTOLOGIN}" ]
+then
+
 if chroot /root [ -f /etc/gdm/gdm-cdd.conf ]; then
     GDMCONF=/etc/gdm/gdm-cdd.conf
 else
@@ -57,6 +60,8 @@
         /root/etc/kde3/kdm/kdmrc
 fi
 
+fi
+
 if chroot /root /usr/bin/which kpersonalizer >/dev/null; then
     # Disable first-login wizard for KDE
     if [ ! -f /root/etc/kde3/kpersonalizerrc ]; then