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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-26 08:49:14 +0000 (Thu, 26 Jul 2007)
New Revision: 2577

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


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-07-26 08:35:32 UTC (rev 2576)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-07-26 08:49:14 UTC (rev 2577)
@@ -1,3 +1,10 @@
+2007-07-26  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live:
+	  - Fixed typo.
+	  - Added live-media-path as suggested by Jordi Pujol
+	    <jordi_pujol at telefonica.net>.
+
 2007-07-19  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live, scripts/live-bottom/02_timezone:

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-07-26 08:35:32 UTC (rev 2576)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-07-26 08:49:14 UTC (rev 2577)
@@ -42,6 +42,8 @@
 live\-initramfs will mount the encrypted rootfs TYPE, asking the passphrase, useful to build paranoid live systems :\-). TYPE supported so far are "aes" for loop\-aes encryption type.
 .IP "\fBlive\-media\-offset=\fR\fIBYTES\fR" 4
 This way you could tell live\-initramfs that your image starts at offset BYTES in the above specified or autodiscovered device, this could be useful to hide the Debian Live iso or image inside another iso or image, to create "clean" images.
+.IP "\fBlive\-media\-path=\fR\fIPATH\fR" 4
+Sets the path to the live filesystem on the medium. By default, it is set to '/live' and you should not change that unless you have customized your media accordingly.
 .IP "\fBlive\-media\-timeout=\fR\fISECONDS\fR" 4
 Set the timeout in seconds for the device specified by "live\-media=" to become ready before giving up.
 .IP "\fB{locale|debian\-installer/locale}=\fR\fILOCALE\fR" 4

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-07-26 08:35:32 UTC (rev 2576)
+++ dists/trunk/live-initramfs/scripts/live	2007-07-26 08:49:14 UTC (rev 2577)
@@ -8,6 +8,7 @@
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
 mountpoint=/live/image
+LIVE_MEDIA_PATH="/live"
 
 root_persistence="live-rw"
 home_persistence="home-rw"
@@ -130,6 +131,11 @@
 				export LIVE_MEDIA_OFFSET
 				;;
 
+			live-media-path=*)
+				LIVE_MEDIA_PATH="${x#live-media-path=}"
+				export LIVE_MEDIA_PATH
+				;;
+
 			live-media-timeout=*)
 				LIVE_MEDIA_TIMEOUT=${x#live-media-timeout=}
 				export LIVE_MEDIA_TIMEOUT
@@ -276,11 +282,11 @@
 {
 	DIRECTORY="${1}"
 
-	if [ -d "${DIRECTORY}"/live ]
+	if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
 	then
 		for FILESYSTEM in squashfs ext2 ext3 xfs dir
 		do
-			if [ "`echo ${DIRECTORY}/live/*.${FILESYSTEM}`" != "${DIRECTORY}/live/*.${FILESYSTEM}" ]
+			if [ "`echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}`" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
 			then
 				return 0
 			fi
@@ -317,11 +323,11 @@
 mount_images_in_directory() {
     directory="$1"
     rootmnt="$2"
-    if match_files_in_dir "$directory/live/*.squashfs" ||
-        match_files_in_dir "$directory/live/*.ext2" ||
-        match_files_in_dir "$directory/live/*.ext3" ||
-        match_files_in_dir "$directory/live/*.dir"; then
-        setup_unionfs "$directory/live" "$rootmnt"
+    if match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.squashfs" ||
+        match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.ext2" ||
+        match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.ext3" ||
+        match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.dir"; then
+        setup_unionfs "$directory/${LIVE_MEDIA_PATH}" "$rootmnt"
     else
         :
     fi