From: Tails developers <amnesia@boum.org>
Date: Wed, 9 Nov 2011 19:06:28 +0000 (+0100)
Subject: Making use of is_supported_fs in find_cow_devices (like in find_files).
X-Git-Tag: debian/3.0_a23-1~14
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=5748431e0be129d18226eff9aff736f3eadc34fd;p=live-boot-grml.git

Making use of is_supported_fs in find_cow_devices (like in find_files).
---

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 90fa3b4..a9c4fbe 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -388,23 +388,22 @@ find_cow_device ()
 			continue
 		fi
 
-		case "$(get_fstype ${dev})" in
-			vfat|ext2|ext3|ext4|jffs2)
-				mkdir -p "${cow_backing}"
-				if try_mount "${dev}" "${cow_backing}" "rw"
+		devfstype="$(get_fstype ${dev})"
+
+		if is_supported_fs ${devfstype}
+		then
+			mkdir -p "${cow_backing}"
+			if try_mount "${dev}" "${cow_backing}" "rw"
+			then
+				if [ -f "${pers_fpath}" ]
 				then
-					if [ -f "${pers_fpath}" ]
-					then
-						echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
-						return 0
-					else
-						umount ${cow_backing} > /dev/null 2>&1 || true
-					fi
+					echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
+					return 0
+				else
+					umount ${cow_backing} > /dev/null 2>&1 || true
 				fi
-				;;
-			*)
-				;;
-		esac
+			fi
+		fi
 	done
 	return 1
 }