X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=d5ad29f6bc9be6ee410ddf55b9d25fd67cb24482;hb=08244e9b0c9b4be3c841fcc7d54f9b940ab4ec1c;hp=70c7f342a77243011b1370feb9b88d16e35e25f9;hpb=f4238ae20312e1d36158ba70ac1076ba4da0211d;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 70c7f34..d5ad29f 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -6,10 +6,19 @@ then
 	export PATH="${PATH}:/usr/lib/klibc/bin"
 fi
 
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+	udevinfo='/sbin/udevadm info'
+else
+	udevinfo='udevinfo'
+fi
+
 sys2dev ()
 {
 	sysdev=${1#/sys}
-	echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+	echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
 }
 
 subdevices ()
@@ -77,7 +86,7 @@ get_fstype ()
 	    return
 	fi
 
-	eval $(fstype < ${1})
+	eval $(fstype ${1} 2>/dev/null)
 
 	if [ "${FSTYPE}" != "unknown" ]
 	then
@@ -95,7 +104,7 @@ where_is_mounted ()
 	if grep -q "^${device} " /proc/mounts
 	then
 		# return the first found
-		grep "^${device} " /proc/mounts | cut -f2 -d ' '
+		grep -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
 	fi
 }
 
@@ -146,7 +155,7 @@ fs_size ()
 			mountp="/mnt/tmp_fs_size"
 
 			mkdir -p "${mountp}"
-			mount -n -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
+			mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}" || log_warning_msg "cannot mount -t $(get_fstype ${dev}) -o ro ${dev} ${mountp}"
 
 			doumount=1
 		fi
@@ -163,7 +172,7 @@ fs_size ()
 
 	if [ -n "${doumount}" ]
 	then
-		umount "${mountp}"
+		umount "${mountp}" || log_warning_msg "cannot umount ${mountp}"
 		rmdir "${mountp}"
 	fi
 
@@ -206,7 +215,7 @@ setup_loop ()
 			dev=$(sys2dev "${loopdev}")
 			options=''
 
-			if [ -n ${readonly} ]
+			if [ -n "${readonly}" ]
 			then
 				if losetup --help 2>&1 | grep -q -- "-r\b"
 				then
@@ -269,22 +278,42 @@ try_mount ()
 	dev="${1}"
 	mountp="${2}"
 	opts="${3}"
+	fstype="${4}"
 
 	old_mountp="$(where_is_mounted ${dev})"
 
 	if [ -n "${old_mountp}" ]
 	then
-		mount -n -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
-		mount -n -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
+		if [ "${opts}" != "ro" ]
+		then
+			mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		fi
+
+		mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
 	else
-		mount -n -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+		if [ -z "${fstype}" ]
+		then
+			fstype=$(get_fstype "${dev}")
+		fi
+		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}"
 	fi
 }
 
 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
 	pers_label="${1}"
 	cow_backing="/${pers_label}-backing"
+	black_listed_devices="${2}"
+
+	if [ -z "${PERSISTENT_PATH}" ]
+	then
+		pers_fpath=${cow_backing}/${pers_label}
+	else
+		pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+	fi
 
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
@@ -292,20 +321,66 @@ find_cow_device ()
 		do
 			devname=$(sys2dev "${dev}")
 
+			if echo "${black_listed_devices}" | grep -q "${devname}"
+			then
+				# skip this device enterely
+				break
+			fi
+
+			# Checking for a luks device
+			if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+			then
+				while true
+				do
+					load_keymap
+
+					/lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " | /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
+					error=${?}
+
+					devname="/dev/mapper/$(basename ${devname})"
+
+					if [ 0 -eq ${error} ]
+					then
+						unset error
+						break
+					fi
+
+					echo
+					echo -n "There was an error decrypting ${devname} ... Retry? [Y/n] " >&6
+					read answer
+
+					if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
+					then
+						unset answer
+						break
+					fi
+				done
+			fi
+
 			if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
 			then
 				echo "${devname}"
-				return
+				return 0
+			fi
+
+			if [ "${PERSISTENT}" = "nofiles" ]
+			then
+				# do not mount the device to find for image files
+				# just skip this
+				continue
 			fi
 
 			case "$(get_fstype ${devname})" in
-				vfat|ext2|ext3|jffs2)
+				vfat|ext2|ext3|ext4|jffs2)
 					mkdir -p "${cow_backing}"
-					try_mount "${devname}" "${cow_backing}" "rw"
+					if ! try_mount "${devname}" "${cow_backing}" "rw"
+					then
+						break
+					fi
 
-					if [ -f "${cow_backing}/${pers_label}" ]
+					if [ -f "${pers_fpath}" ]
 					then
-						echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+						echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
 						return 0
 					else
 						umount ${cow_backing}
@@ -316,15 +391,17 @@ find_cow_device ()
 			esac
 		done
 	done
+	return 1
 }
 
 find_files ()
 {
-	# return the first of ${filenames} found on vfat and ext2/ext3 devices
+	# return the a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition
 	# FIXME: merge with above function
 
 	filenames="${1}"
 	snap_backing="/snap-backing"
+	black_listed_devices="${2}"
 
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
@@ -333,19 +410,28 @@ find_files ()
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
+			if echo "${black_listed_devices}" | grep -q "${devname}"
+			then
+				# skip this device enterely
+				break
+			fi
+
 			if is_supported_fs ${devfstype}
 			then
 				mkdir -p "${snap_backing}"
-				try_mount "${devname}" "${snap_backing}" "ro"
 
-				for filename in ${filenames}
+				if try_mount "${devname}" "${snap_backing}" "ro" "${devfstype}"
+				then
+					for filename in ${filenames}
 					do
-					if [ -f "${snap_backing}/${filename}" ]
-					then
-						echo "${devname} ${snap_backing} ${filename}"
-						return 0
-					fi
-				done
+						if [ -f "${snap_backing}/${filename}" ]
+						then
+							echo "${devname} ${snap_backing} ${filename}"
+							umount ${snap_backing}
+							return 0
+						fi
+					done
+				fi
 
 				umount ${snap_backing}
 			fi