From: Michael Prokop <mika@grml.org>
Date: Fri, 2 Apr 2010 14:33:23 +0000 (+0200)
Subject: Prefer removable devices over non-removable devices, so scan them first.
X-Git-Tag: debian/1.177.2-1~3
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=6759640353d9896cc0b6d4fe81085a0004d62143;p=live-boot-grml.git

Prefer removable devices over non-removable devices, so scan them first.
---

diff --git a/scripts/live b/scripts/live
index bae9193..8ad11bb 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1627,8 +1627,20 @@ find_livefs ()
 	esac
 
 	# or do the scan of block devices
+	# prefer removable devices over non-removable devices, so scan them first
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
 	do
+		if [ "$(cat ${sysblock}/removable)" = "1" ]
+		then
+			removable_devices_to_scan="$removable_devices_to_scan $sysblock"
+		else
+			nonremovable_devices_to_scan="$nonremovable_devices_to_scan $sysblock"
+		fi
+	done
+	devices_to_scan="$removable_devices_to_scan $nonremovable_devices_to_scan"
+
+	for sysblock in $devices_to_scan
+	do
 		devname=$(sys2dev "${sysblock}")
 		fstype=$(get_fstype "${devname}")