main/openrc: fix modloop to find mounts by UUID and LABEL

ref #734

1 files changed, 29 insertions, 4 deletions

diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd
index 714b6057a3..1a12f6fccd 100644
--- a/main/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
@@ -20,10 +20,35 @@ init_KOPT() {
 	done
 }
 
+resolve_dev() {
+	case "$1" in
+	UUID=*|LABEL=*) findfs "$1";;
+	*) readlink -f "$1";;
+	esac
+}
+
 find_mnt() {
-	local dev="$1"
-	local fsfile="$2"
-	awk "\$ == \"$dev\" {print \$2}\"" "$fsfile" 2>/dev/null
+	local search_dev="$1" fstab="$2"
+	local dev mnt fs mntopts chk
+	case "$search_dev" in
+		UUID=*|LABEL=*|/dev/*);;
+		*) search_dev=/dev/$search_dev;;
+	esac
+	local search_real_dev=$(resolve_dev $search_dev)
+	while read dev mnt fs mntopts chk; do
+		local real_dev=$(resolve_dev $dev)
+		local i j
+		for i in "$search_dev" "$search_real_dev"; do
+			[ -z "$i" ] && continue
+			for j in "$dev" "$real_dev"; do
+				[ -z "$j" ] && continue
+				if [ "$i" = "$j" ]; then
+					echo "$mnt"
+					return
+				fi
+			done
+		done
+	done < $fstab 2>/dev/null
 }
 
 # initialies: alpine_dev, alpine_mnt, alpine_fs, alpine_mounted
@@ -34,7 +59,7 @@ find_media() {
 	alpine_fs=${KOPT_alpine_dev#*:}
 	[ "$alpine_fs" = "$KOPT_alpine_dev" ] && unset alpine_fs
 	# first we check if alpine_dev is mounted and use this
-	alpine_mnt=$(find_mnt /dev/$alpine_dev /proc/mounts)
+	alpine_mnt=$(find_mnt $alpine_dev /proc/mounts)
 	if [ -z "$alpine_mnt" ]; then
 		# then we check fstab
 		alpine_mnt=$(find_mnt /dev/$alpine_dev /etc/fstab)