Attachment 570823 Details for Bug 846003

[patch] os-prober-fix-btrfs-subvol-mounted-tests.patch

os-prober-fix-btrfs-subvol-mounted-tests.patch (text/plain), 2.90 KB, created by Michael Chang on 2013-12-09 10:19:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Chang

Created: 2013-12-09 10:19:18 UTC

Size: 2.90 KB

patch

obsolete

>Index: os-prober-1.61/os-probes/common/50mounted-tests
>===================================================================
>--- os-prober-1.61.orig/os-probes/common/50mounted-tests
>+++ os-prober-1.61/os-probes/common/50mounted-tests
>@@ -62,10 +62,54 @@ fi
> 
> mounted=
> 
>-# all btrfs processing here.  Handle both unmounted and
>-# mounted subvolumes.
> if [ "$types" = btrfs ]; then
> 	partition="$BTRFSDEV"
>+fi
>+
>+if type grub2-mount >/dev/null 2>&1 && \
>+   type grub2-probe >/dev/null 2>&1 && \
>+   grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
>+	mounted=1
>+	type="$(grub2-probe -d "$partition" -t fs)" || true
>+	if [ "$type" ]; then
>+		debug "mounted using GRUB $type filesystem driver"
>+	else
>+		debug "mounted using GRUB, but unknown filesystem?"
>+		type=fuseblk
>+	fi
>+else
>+	ro_partition "$partition"
>+	for type in $types $delaytypes; do
>+		if mount -o ro -t "$type" "$partition" "$tmpmnt" 2>/dev/null; then
>+			debug "mounted as $type filesystem"
>+			mounted=1
>+			break
>+		fi
>+	done
>+fi
>+
>+if [ "$mounted" ]; then
>+	for test in /usr/lib/os-probes/mounted/*; do
>+		debug "running subtest $test"
>+		if [ -f "$test" ] && [ -x "$test" ]; then
>+			if "$test" "$partition" "$tmpmnt" "$type"; then
>+				debug "os found by subtest $test"
>+				if ! umount "$tmpmnt"; then
>+					warn "failed to umount $tmpmnt"
>+				fi
>+				rmdir "$tmpmnt" || true
>+				exit 0
>+			fi
>+		fi
>+	done
>+	if ! umount "$tmpmnt"; then
>+		warn "failed to umount $tmpmnt"
>+	fi
>+fi
>+
>+# all btrfs subvol processing here.  Handle both unmounted and
>+# mounted subvolumes.
>+if [ "$types" = btrfs ]; then
> 	debug "begin btrfs processing for $UUID"
> 	# note that the btrfs volume must not be mounted ro
> 	if mount -t btrfs -U "$UUID" "$tmpmnt"  2>/dev/null; then
>@@ -123,52 +167,9 @@ if [ "$types" = btrfs ]; then
> 			fi
> 		fi
> 	done
>-	rmdir "$tmpmnt" || true
> 	if [ "$found" ]; then
>+		rmdir "$tmpmnt" || true
> 		exit 0
>-	else
>-		exit 1
>-	fi
>-fi
>-
>-if type grub2-mount >/dev/null 2>&1 && \
>-   type grub2-probe >/dev/null 2>&1 && \
>-   grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
>-	mounted=1
>-	type="$(grub2-probe -d "$partition" -t fs)" || true
>-	if [ "$type" ]; then
>-		debug "mounted using GRUB $type filesystem driver"
>-	else
>-		debug "mounted using GRUB, but unknown filesystem?"
>-		type=fuseblk
>-	fi
>-else
>-	ro_partition "$partition"
>-	for type in $types $delaytypes; do
>-		if mount -o ro -t "$type" "$partition" "$tmpmnt" 2>/dev/null; then
>-			debug "mounted as $type filesystem"
>-			mounted=1
>-			break
>-		fi
>-	done
>-fi
>-
>-if [ "$mounted" ]; then
>-	for test in /usr/lib/os-probes/mounted/*; do
>-		debug "running subtest $test"
>-		if [ -f "$test" ] && [ -x "$test" ]; then
>-			if "$test" "$partition" "$tmpmnt" "$type"; then
>-				debug "os found by subtest $test"
>-				if ! umount "$tmpmnt"; then
>-					warn "failed to umount $tmpmnt"
>-				fi
>-				rmdir "$tmpmnt" || true
>-				exit 0
>-			fi
>-		fi
>-	done
>-	if ! umount "$tmpmnt"; then
>-		warn "failed to umount $tmpmnt"
> 	fi
> fi
>

Actions: View | Diff

Attachments on bug 846003: 563511 | 563514 | 563515 | 569484 | 569485 | 570823