X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=b1883ff57b8d92b67ea1e92be91ff2f7d4ba65e3;hb=1b0d5fbb892e744080cb0672d95eba347d09b9b6;hp=0e9b0d02d2cc655fdfbb270b2062fe1c629ea953;hpb=efd0d026583cdf75807f60fb6e556a498a291e0b;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 0e9b0d0..b1883ff 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -26,7 +26,7 @@ subdevices ()
 	sysblock=${1}
 	r=""
 
-	for dev in "${sysblock}" "${sysblock}"/*
+	for dev in "${sysblock}"/* "${sysblock}"
 	do
 		if [ -e "${dev}/dev" ]
 		then
@@ -297,13 +297,21 @@ find_cow_device ()
 
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
+		fulldevname=$(sys2dev "${sysblock}")
+
+		if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+		then
+			# skip this device entirely
+			break
+		fi
+
 		for dev in $(subdevices "${sysblock}")
 		do
 			devname=$(sys2dev "${dev}")
 
 			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
-				# skip this device enterely
+				# skip this subdevice
 				break
 			fi
 
@@ -383,6 +391,14 @@ find_files ()
 
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
+		fulldevname=$(sys2dev "${sysblock}")
+
+		if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+		then
+			# skip this device entirely
+			break
+		fi
+
 		for dev in $(subdevices "${sysblock}")
 		do
 			devname=$(sys2dev "${dev}")
@@ -390,7 +406,7 @@ find_files ()
 
 			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
-				# skip this device enterely
+				# skip this subdevice
 				break
 			fi