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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-01 11:54:01 +0000 (Sun, 01 Jul 2007)
New Revision: 2320

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/hooks/live
   dists/trunk/live-initramfs/manpages/live-initramfs.en.7
   dists/trunk/live-initramfs/scripts/live
   dists/trunk/live-initramfs/scripts/live-bottom/12fstab
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-07-01 11:36:44 UTC (rev 2319)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-07-01 11:54:01 UTC (rev 2320)
@@ -1,3 +1,11 @@
+2007-06-31  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live:
+	  - Added patch from Jan Andres Klode <jak at jak-linux.org> to add
+	    support for aufs.
+	* hooks/live, manpage/live-initramfs.en.7, scripts/live-bottom/12fstab:
+	  - Added aufs support.
+
 2007-06-30  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live-bottom/12fstab:

Modified: dists/trunk/live-initramfs/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live	2007-07-01 11:36:44 UTC (rev 2319)
+++ dists/trunk/live-initramfs/hooks/live	2007-07-01 11:54:01 UTC (rev 2320)
@@ -73,8 +73,9 @@
 manual_add_modules loop
 manual_add_modules squashfs
 
-# Filesystem: unionfs
+# Filesystem: unionfs/aufs
 manual_add_modules unionfs
+manual_add_modules aufs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-07-01 11:36:44 UTC (rev 2319)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-07-01 11:54:01 UTC (rev 2320)
@@ -78,6 +78,8 @@
 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
 Adding this parameter, live\-initramfs will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media.
+.IP "\fBunion=\fR\fIunionfs|aufs\fR" 4
+By default, live-initramfs uses unionfs. With this parameter, you can switch to aufs.
 .IP "\fBxdebconf\fR" 4
 uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental).
 .IP "\fBxvideomode=\fR\fIRESOLUTION\fR" 4

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-07-01 11:36:44 UTC (rev 2319)
+++ dists/trunk/live-initramfs/scripts/live	2007-07-01 11:54:01 UTC (rev 2320)
@@ -214,6 +214,11 @@
 				export TORAM
 				;;
 
+			union=*)
+				UNIONTYPE="${x#union=}"
+				export UNIONTYPE
+				;;
+
 			xdebconf)
 				XDEBCONF="Yes"
 				export XDEBCONF
@@ -243,7 +248,14 @@
 	if [ -z "${MODULE}" ]
 	then
 		MODULE="filesystem"
+		export MODULE
 	fi
+
+	if [ -z "${UNIONTYPE}" ]
+	then
+		UNIONTYPE="unionfs"
+		export UNIONTYPE
+	fi
 }
 
 is_live_path()
@@ -530,7 +542,7 @@
     image_directory="$1"
     rootmnt="$2"
 
-    modprobe "${MP_QUIET}" -b unionfs
+    modprobe "${MP_QUIET}" -b ${UNIONTYPE}
 
     # run-init can't deal with images in a subdir, but we're going to
     # move all of these away before it runs anyway.  No, we're not,
@@ -614,7 +626,7 @@
 
     mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
 
-    mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
+    mount -t ${UNIONTYPE} -o dirs=/cow=rw:$rofsstring ${UNIONTYPE} "$rootmnt" || panic "${UNIONTYPE} mount failed"
 
     # Adding other custom mounts
     if [ -n "${PERSISTENT}" ]; then

Modified: dists/trunk/live-initramfs/scripts/live-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/12fstab	2007-07-01 11:36:44 UTC (rev 2319)
+++ dists/trunk/live-initramfs/scripts/live-bottom/12fstab	2007-07-01 11:54:01 UTC (rev 2320)
@@ -29,7 +29,7 @@
 FSTAB=/root/etc/fstab
 
 cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
+${UNIONTYPE} / ${UNIONTYPE} rw 0 0
 tmpfs /tmp tmpfs nosuid,nodev 0 0
 EOF