[SCM] debian-live branch, master, updated. 1.139.1-1-2-g14f0f64

Daniel Baumann daniel at debian.org
Tue Aug 26 13:26:56 UTC 2008


The following commit has been merged in the master branch:
commit d36796282505ccac17d2ceec2362d383fc8f48f4
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 25 13:12:57 2008 +0200

    If the filesystem type of the rootfs cannot be automatically detected, we try to assume it from the extension of the imagefile we have found. Thanks to Jordi Pujol <jordi_pujol at telefonica.net> (Closes: #460456).

diff --git a/scripts/live b/scripts/live
index 0363daf..ec5f6e8 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1040,6 +1040,12 @@ setup_unionfs ()
 				panic "Unknown file system type on ${backdev} (${image})"
 			fi
 
+			if [ -z "${fstype}" ]
+			then
+				fstype="${imagename##*.}"
+				log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
+			fi
+
 			mkdir -p "${croot}/${imagename}"
 			log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\""
 			mount -n -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"

-- 
debian-live



More information about the debian-live-changes mailing list