[SCM] live-initramfs branch, master, updated. 1.157.4-1-11-gfc2a897

Daniel Baumann daniel at debian.org
Mon Oct 26 11:57:54 UTC 2009


The following commit has been merged in the master branch:
commit 3ead31f911689ccd5865e49bac2d4d09c63440c3
Author: Michael Prokop <mika at grml.org>
Date:   Mon Oct 26 12:45:30 2009 +0100

    Avoid the use of fstype in a running live system, as it's a executable and not a shell function and causes problems for example within live-snapshot.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index d5ad29f..0d97d10 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -76,24 +76,6 @@ is_supported_fs ()
 
 get_fstype ()
 {
-	local FSTYPE
-	local FSSIZE
-
-	# fstype misreports LUKS devices
-	if is_luks "${1}"
-	then
-	    /lib/udev/vol_id -t ${1} 2>/dev/null
-	    return
-	fi
-
-	eval $(fstype ${1} 2>/dev/null)
-
-	if [ "${FSTYPE}" != "unknown" ]
-	then
-		echo ${FSTYPE}
-		return 0
-	fi
-
 	/lib/udev/vol_id -t ${1} 2>/dev/null
 }
 

-- 
live-initramfs



More information about the debian-live-changes mailing list