X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=73d9f9d57ee76b652d5feff8761eda4ce7e0be04;hb=3f02456e392ead3abf36bc181692fcb75c8f16f3;hp=47674e659df21cc1236bbbef6c4ad7759fe7f4f8;hpb=454a73ce6394830923bc54b584d33edf0e6918b1;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 47674e6..73d9f9d 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
@@ -76,15 +76,7 @@ is_supported_fs ()
 
 get_fstype ()
 {
-	# udev (>= 146) no longer provides vol_id
-	if [ -x /lib/udev/vol_id ]
-	then
-		# lenny
-		/lib/udev/vol_id -t ${1} 2>/dev/null
-	else
-		# squeeze
-		/sbin/blkid -s TYPE -o value $1 2>/dev/null
-	fi
+	/sbin/blkid -s TYPE -o value $1 2>/dev/null
 }
 
 where_is_mounted ()
@@ -283,7 +275,7 @@ try_mount ()
 			fstype=$(get_fstype "${dev}")
 		fi
 		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
-		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
+		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live-boot.log && return 0 )
 	fi
 }
 
@@ -291,10 +283,13 @@ find_cow_device ()
 {
 	# Returns a device containing a partition labeled "${pers_label}" or containing a file named the same way
 	#  in the latter case the partition containing the file is left mounted
-	#  if is not in black_listed_devices
+	#  if is not in black_listed_devices.
+	#  Additionally, if the white_listed_devices list is non-empty, the
+	#  parent block device of the returned device must be part of this list.
 	pers_label="${1}"
 	cow_backing="/${pers_label}-backing"
 	black_listed_devices="${2}"
+	white_listed_devices="${3}"
 
 	if [ -z "${PERSISTENT_PATH}" ]
 	then
@@ -305,13 +300,30 @@ 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
+
+		if [ -n "${white_listed_devices}" ]
+		then
+			if echo "${white_listed_devices}" | grep -v -q -w "${fulldevname}"
+			then
+				# skip this device entirely
+				break
+			fi
+		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
 
@@ -345,22 +357,10 @@ find_cow_device ()
 				done
 			fi
 
-			# udev (>= 146) no longer provides vol_id
-			if [ -x /lib/udev/vol_id ]
+			if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
 			then
-				# lenny
-				if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
-				then
-					echo "${devname}"
-					return 0
-				fi
-			else
-				# squeeze
-				if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
-				then
-					echo "${devname}"
-					return 0
-				fi
+				echo "${devname}"
+				return 0
 			fi
 
 			if [ "${PERSISTENT}" = "nofiles" ]
@@ -395,14 +395,35 @@ find_cow_device ()
 find_files ()
 {
 	# return the a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition
+	#  if is not in black_listed_devices.
+	#  Additionally, if the white_listed_devices list is non-empty, the
+	#  parent block device of the returned device must be part of this list.
 	# FIXME: merge with above function
 
 	filenames="${1}"
 	snap_backing="/snap-backing"
 	black_listed_devices="${2}"
+	white_listed_devices="${3}"
 
 	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
+
+		if [ -n "${white_listed_devices}" ]
+		then
+			if echo "${white_listed_devices}" | grep -v -q -w "${fulldevname}"
+			then
+				# skip this device entirely
+				break
+			fi
+		fi
+
 		for dev in $(subdevices "${sysblock}")
 		do
 			devname=$(sys2dev "${dev}")
@@ -410,7 +431,7 @@ find_files ()
 
 			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
-				# skip this device enterely
+				# skip this subdevice
 				break
 			fi
 
@@ -467,3 +488,73 @@ is_luks()
     fi
 
 }
+
+removable_dev ()
+{
+	output_format="${1}"
+	want_usb="${2}"
+	ret=
+
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+	do
+		dev_ok=
+		if [ "$(cat ${sysblock}/removable)" = "1" ]
+		then
+			if [ -z "${want_usb}" ]
+			then
+				dev_ok="yes"
+			else
+				if readlink ${sysblock} | grep -q usb
+				then
+					dev_ok="yes"
+				fi
+			fi
+		fi
+
+		if [ "${dev_ok}" = "yes" ]
+		then
+			case "${output_format}" in
+				sys)
+					ret="${ret} ${sysblock}"
+					;;
+				*)
+					devname=$(sys2dev "${sysblock}")
+					ret="${ret} ${devname}"
+					;;
+			esac
+		fi
+	done
+
+	echo "${ret}"
+}
+
+removable_usb_dev ()
+{
+	output_format="${1}"
+
+	removable_dev "${output_format}" "want_usb"
+}
+
+non_removable_dev ()
+{
+	output_format="${1}"
+	ret=
+
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+	do
+		if [ "$(cat ${sysblock}/removable)" = "0" ]
+		then
+			case "${output_format}" in
+				sys)
+					ret="${ret} ${sysblock}"
+					;;
+				*)
+					devname=$(sys2dev "${sysblock}")
+					ret="${ret} ${devname}"
+					;;
+			esac
+		fi
+	done
+
+	echo "${ret}"
+}