Attachment 667844 Details for Bug 888341 – A patch from Ubuntu's os-prober which is supposed to fix btrfs subvolume detection problem

[patch] A patch from Ubuntu's os-prober which is supposed to fix btrfs subvolume detection problem

os-prober-btrfsfix.patch (text/plain), 2.21 KB, created by Hedayat Vatankhah on 2012-12-22 21:45:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hedayat Vatankhah

Created: 2012-12-22 21:45:16 UTC

Size: 2.21 KB

patch

obsolete

>diff -ru os-prober-1.56/linux-boot-probes/common/50mounted-tests os-prober/linux-boot-probes/common/50mounted-tests
>--- os-prober-1.56/linux-boot-probes/common/50mounted-tests	2012-03-27 19:12:12.000000000 +0430
>+++ os-prober/linux-boot-probes/common/50mounted-tests	2012-03-27 22:17:43.000000000 +0430
>@@ -45,6 +45,18 @@
> 	for type in $types; do
> 		if mount -o ro -t "$type" "$partition" "$tmpmnt" 2>/dev/null; then
> 			mounted=1
>+			case "$type" in
>+			    btrfs)
>+				if [ -x "$tmpmnt/@/lib" ] && \
>+				   ! mount --bind "$tmpmnt/@" "$tmpmnt"; then
>+					warn "failed to mount btrfs subvolume @ on $partition"
>+					if ! umount $tmpmnt; then
>+						warn "failed to umount $tmpmnt"
>+					fi
>+					mounted=
>+				fi
>+				;;
>+			esac	
> 			break
> 		fi
> 	done
>@@ -64,6 +76,16 @@
> 				if ! umount "$tmpmnt"; then
> 					warn "failed to umount $tmpmnt"
> 				fi
>+				case $type in
>+				    btrfs)
>+					# umount to account for the bind-mount
>+					if [ -x "$tmpmnt/@/lib" ] && \
>+					   ! umount $tmpmnt; then
>+						warn "failed to umount $tmpmnt"
>+					fi
>+					;;
>+				esac
>+						
> 				rmdir "$tmpmnt" || true
> 				exit 0
> 			fi
>diff -ru os-prober-1.56/os-probes/common/50mounted-tests os-prober/os-probes/common/50mounted-tests
>--- os-prober-1.56/os-probes/common/50mounted-tests	2012-09-17 19:38:12.000000000 +0430
>+++ os-prober/os-probes/common/50mounted-tests	2012-09-18 02:47:58.000000000 +0430
>@@ -62,6 +62,18 @@
> 	for type in $types $delaytypes; do
> 		if mount -o ro -t "$type" "$partition" "$tmpmnt" 2>/dev/null; then
> 			debug "mounted as $type filesystem"
>+			case "$type" in
>+			    btrfs)
>+				if [ -x "$tmpmnt/@/lib" ] && \
>+				   ! mount --bind "$tmpmnt/@" "$tmpmnt"; then
>+					warn "failed to mount btrfs subvolume @ on $partition"
>+					if ! umount $tmpmnt; then
>+						warn "failed to umount $tmpmnt"
>+					fi
>+					mounted=
>+				fi
>+				;;
>+			esac	
> 			mounted=1
> 			break
> 		fi
>@@ -77,6 +89,15 @@
> 				if ! umount "$tmpmnt"; then
> 					warn "failed to umount $tmpmnt"
> 				fi
>+				case "$type" in
>+				    btrfs)
>+					# umount to account for the bind-mount
>+					if [ -x "$tmpmnt/@/lib" ] && \
>+					   ! umount $tmpmnt; then
>+						warn "failed to umount $tmpmnt"
>+					fi
>+					;;
>+				esac
> 				rmdir "$tmpmnt" || true
> 				exit 0
> 			fi

Actions: View | Diff

Attachments on bug 888341: 667344 | 667345 | 667844 | 670472 | 672110 | 676324 | 1026442