r2833 - in dists/trunk/live-initramfs: docs manpages scripts scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-09-05 05:35:27 +0000 (Wed, 05 Sep 2007)
New Revision: 2833

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/docs/parameters.txt
   dists/trunk/live-initramfs/manpages/live-initramfs.en.7
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/10adduser
   dists/trunk/live-initramfs/scripts/live-bottom/12fstab
   dists/trunk/live-initramfs/scripts/live-bottom/13swap
   dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-09-05 05:35:27 UTC (rev 2833)
@@ -1,3 +1,9 @@
+2007-09-05  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live, scripts/live-bottom:
+	  - Added nouser parameter to disable user creation.
+	  - Added noxautoconfig parameter to disable xorg re-configuration.
+
 2007-09-01  Daniel Baumann  <daniel at debian.org>
 
 	* Merging changes from casper 1.97, 1.98 and 1.99.

Modified: dists/trunk/live-initramfs/docs/parameters.txt
===================================================================
--- dists/trunk/live-initramfs/docs/parameters.txt	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/docs/parameters.txt	2007-09-05 05:35:27 UTC (rev 2833)
@@ -36,6 +36,8 @@
 live nopersistent
 live nosudo
 live noswap
+live nouser
+live noxautoconfig
 live persistent
 live {preseed/file|file}=FILE
 live package/question=VALUE

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-09-05 05:35:27 UTC (rev 2833)
@@ -68,6 +68,10 @@
 This parameter disables the automatic configuration of sudo.
 .IP "\fBnoswap\fR" 4
 This parameter disables usage of local swap partitions.
+.IP "\fBnouser\fR" 4
+This parameter disables the creation of the default user completely.
+.IP "\fBnoxautoconfig\fR" 4
+This parameter disables Xorg auto-reconfiguration at boot time. This is valuable if you either do the detection on your own, or, if you want to ship a custom, premade xorg.conf in your live system.
 .IP "\fBpersistent\fR" 4
 live\-initramfs will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at \fIlive\-snapshot\fR(1) for more informations.
 .IP "\fB{preseed/file|file}=\fR\fIFILE\fR" 4

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/scripts/live	2007-09-05 05:35:27 UTC (rev 2833)
@@ -194,6 +194,16 @@
 				export NOSWAP
 				;;
 
+			nouser)
+				NOUSER="Yes"
+				export NOUSER
+				;;
+
+			noxautoconfig)
+				NOXAUTOCONFIG="Yes"
+				export NOXAUTOCONFIG
+				;;
+
 			persistent)
 				PERSISTENT="Yes"
 				export PERSISTENT

Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-09-05 05:35:27 UTC (rev 2833)
@@ -22,6 +22,11 @@
 
 . /scripts/live-functions
 
+if [ "${NOUSER}" = "Yes" ]
+then
+	exit 0
+fi
+
 log_begin_msg "Adding live session user..."
 
 # live-initramfs script

Modified: dists/trunk/live-initramfs/scripts/live-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/12fstab	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/scripts/live-bottom/12fstab	2007-09-05 05:35:27 UTC (rev 2833)
@@ -22,6 +22,11 @@
 
 . /scripts/live-functions
 
+if [ "${NOFSTAB}" = "Yes" ]
+then
+	exit 0
+fi
+
 log_begin_msg "Configuring fstab..."
 
 # live-initramfs script

Modified: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-09-05 05:35:27 UTC (rev 2833)
@@ -27,6 +27,11 @@
 
 . /scripts/live-functions
 
+if [ "${NOFSTAB}" = "Yes" ]
+then
+	exit 0
+fi
+
 log_begin_msg "Setting up swap..."
 
 # live-initramfs script

Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig	2007-09-04 11:13:43 UTC (rev 2832)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig	2007-09-05 05:35:27 UTC (rev 2833)
@@ -22,6 +22,11 @@
 
 . /scripts/live-functions
 
+if [ "${NOXAUTOCONFIG}" = "Yes" ]
+then
+	exit 0
+fi
+
 log_begin_msg "Configuring X..."
 
 # live-initramfs script