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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-18 16:54:40 +0000 (Fri, 18 May 2007)
New Revision: 1568

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/10adduser
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 16:46:39 UTC (rev 1567)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-18 16:54:40 UTC (rev 1568)
@@ -2,9 +2,12 @@
 
 	* scripts/live, scripts/live-bottom/05mountpoints:
 	  - Replaced 'mount -o move' with 'mount --move'.
+	* scripts/live, scripts/live-bottom/10adduser:
+	  - Added check for 'nosudo' bootparameter to disable automatic
+	    sudo configuration.
 	* scripts/live, scripts/live-bottom/13swap:
 	  - Renamed 'swapoff' parameter to 'noswap'.
-	* scripts/live, scripts/live-bottom/15adduser:
+	* scripts/live, scripts/live-bottom/15autologin:
 	  - Added check for 'noxautologin' bootparameter to disable automatic
 	    gdm/kdm login.
 	* scripts/live, scripts/live-bottom/25configure_init:

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-18 16:46:39 UTC (rev 1567)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-05-18 16:54:40 UTC (rev 1568)
@@ -52,6 +52,8 @@
 This parameter disables the automatic login of gdm/kdm only, not touching terminals.
 .IP "\fBnopersistent\fR" 4
 disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
+.IP "\fBnosudo\fR" 4
+This parameter disables the automatic configuration of sudo.
 .IP "\fBnoswap\fR" 4
 This parameter disables usage of local swap partitions.
 .IP "\fBpersistent\fR" 4

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-18 16:46:39 UTC (rev 1567)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-18 16:54:40 UTC (rev 1568)
@@ -66,6 +66,8 @@
 	    	export NOAUTOLOGIN="Yes" ;;
 	    noxautologin)
 	    	export NOXAUTOLOGIN="Yes" ;;
+	    nosudo)
+	    	export NOSUDO="Yes" ;;
             showmounts)
                 export SHOWMOUNTS="Yes" ;;
             persistent)

Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-18 16:46:39 UTC (rev 1567)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-18 16:54:40 UTC (rev 1568)
@@ -58,6 +58,9 @@
 set passwd/user-uid
 EOF
 
+if [ -z "${NOSUDO}" ]
+then
+
 if [ -f /root/etc/sudoers ]; then
     if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
         grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
@@ -96,6 +99,8 @@
     fi
 fi
 
+fi
+
 if [ -L /root/home/$USERNAME/Examples ]; then
     chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
     mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/