[Debian-live-changes] r2321 - in dists/trunk/live-helper: docs functions helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-01 12:12:04 +0000 (Sun, 01 Jul 2007)
New Revision: 2321

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-01 11:54:01 UTC (rev 2320)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-01 12:12:04 UTC (rev 2321)
@@ -2,6 +2,9 @@
 
 	* helpers/lh_binary_debian-installer:
 	  - Added caching of udebs.
+	* functions/defaults.sh, helpers/lh_binary_grub, lh_binary_syslinux,
+	  lh_binary_grub, lh_config:
+	  - Added support for aufs.
 
 2007-06-30  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-07-01 11:54:01 UTC (rev 2320)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-07-01 12:12:04 UTC (rev 2321)
@@ -318,6 +318,9 @@
 	# Setting chroot filesystem
 	LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}"
 
+	# Setting union filesystem
+	LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM:-unionfs}"
+
 	# LIVE_HOOKS
 
 	# Setting interactive shell/X11/Xnest
@@ -411,7 +414,7 @@
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6"
+				LIVE_LINUX_PACKAGES="linux-image-2.6 ${LIVE_UNION_FILESYSTEM}-modules-2.6"
 
 				if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ]
 				then

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-01 11:54:01 UTC (rev 2320)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-07-01 12:12:04 UTC (rev 2321)
@@ -156,6 +156,11 @@
 	esac
 fi
 
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-01 11:54:01 UTC (rev 2320)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-07-01 12:12:04 UTC (rev 2321)
@@ -218,6 +218,11 @@
 	esac
 fi
 
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-01 11:54:01 UTC (rev 2320)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-07-01 12:12:04 UTC (rev 2321)
@@ -141,6 +141,11 @@
 	esac
 fi
 
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-07-01 11:54:01 UTC (rev 2320)
+++ dists/trunk/live-helper/helpers/lh_config	2007-07-01 12:12:04 UTC (rev 2321)
@@ -236,6 +236,10 @@
 # (Default: ${LIVE_CHROOT_FILESYSTEM})
 LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
 
+# \$LIVE_UNION_FILESYSTEM: set union filesystem
+# (Default: ${LIVE_UNION_FILESYSTEM}
+LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM}"
+
 # \$LIVE_HOOKS: set hook commands
 # (Default: empty)
 LIVE_HOOKS="${LIVE_HOOKS}"