From f7844126b88fd104016316b0dfa5a8c731a63a05 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 31 May 2008 10:53:55 +0200
Subject: Merging casper 1.132.

---
 scripts/live | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'scripts/live')

diff --git a/scripts/live b/scripts/live
index 867d4f9..29832c9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -556,20 +556,6 @@ is_nice_device ()
 	return 1
 }
 
-is_supported_fs ()
-{
-	# FIXME: do something better like the scan of supported filesystems
-	fstype="${1}"
-
-	case ${fstype} in
-		vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
-			return 0
-			;;
-	esac
-
-	return 1
-}
-
 copy_live_to ()
 {
 	copyfrom="${1}"
@@ -1164,6 +1150,19 @@ check_dev ()
 		devname="${loopdevname}"
 	fi
 
+	if [ -d "${devname}" ]
+	then
+		mount -o bind "${devname}" $mountpoint || continue
+
+		if is_live_path $mountpoint
+		then
+			echo $mountpoint
+			return 0
+		else
+			umount $mountpoint
+		fi
+	fi
+
 	fstype=$(get_fstype "${devname}")
 
 	if is_supported_fs ${fstype}
-- 
cgit v1.2.3