diff --git a/os-prober-btrfsfix.patch b/os-prober-btrfsfix.patch index dd07ede..1fd639a 100644 --- a/os-prober-btrfsfix.patch +++ b/os-prober-btrfsfix.patch @@ -314,7 +314,7 @@ Index: os-prober-1.57/os-probes/common/50mounted-tests + # besides regular subvols, get ro and snapshot so thet can be excluded + subvols=$(btrfs subvolume list "$tmpmnt" | cut -d ' ' -f 9) + rosubvols=$(btrfs subvolume list -r "$tmpmnt" | cut -d ' ' -f 9) -+ sssubvols=$(btrfs subvolume list -s "$tmpmnt" | cut -d ' ' -f 9) ++ sssubvols=$(btrfs subvolume list -s "$tmpmnt" | cut -d ' ' -f 14) + if ! umount "$tmpmnt"; then + warn "failed to umount btrfs volume on $tmpmnt" + rmdir "$tmpmnt" || true diff --git a/os-prober.changes b/os-prober.changes index 53590a5..acd1cea 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 15 15:59:02 UTC 2014 - arvidjaar@gmail.com + +- fix os-prober-btrfsfix.patch - current "btrfs subvolume list -s" + adds some extra fields. Adjust field number to get subvolume name. + ------------------------------------------------------------------- Wed Dec 18 04:16:03 UTC 2013 - mchang@suse.com diff --git a/os-prober.spec b/os-prober.spec index 0e4eaac..8c7d653 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -1,7 +1,7 @@ # # spec file for package os-prober # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,12 +55,12 @@ Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe +Requires: btrfsprogs Requires: coreutils Requires: dmraid Requires: lvm2 Requires: udev Requires: util-linux -Requires: btrfsprogs %description This package detects other OSes available on a system and outputs the results