X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=807553a694becf5eff5457fe6d92cc7851d03e72;hb=845dee811a0159b75422eb7e4cfb6c860d39690b;hp=5e1730bf652ea7a93ee2e594a5dc99ed2a38abc0;hpb=baa2ce2723e1b7925b596d3fc12a62e8a99e2cb4;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 5e1730b..807553a 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -34,6 +34,13 @@ get_fstype ()
 	local FSTYPE
 	local FSSIZE
 
+	# fstype misreports LUKS devices
+	is_luks "${1}"
+	if [ $? -eq 0 ]; then
+	    /lib/udev/vol_id -t ${1} 2>/dev/null
+	    return
+	fi
+
 	eval $(fstype < ${1})
 
 	if [ "${FSTYPE}" != "unknown" ]
@@ -268,7 +275,7 @@ find_files ()
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
-			if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ]
+			if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] || [ "${devfstype}" = "jffs2" ]
 			then
 				# FIXME: all supported block devices should be scanned
 				mkdir -p "${snap_backing}"
@@ -306,3 +313,16 @@ get_mac ()
 
 	echo ${mac}
 }
+
+is_luks()
+{
+    devname="${1}"
+    if [ -x /sbin/cryptsetup ]
+    then
+	/sbin/cryptsetup isLuks "${devname}" 2>/dev/null
+	return $?
+    else
+	return 1
+    fi
+
+}