Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2014-01-17 11:05:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-prober" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2013-12-23 22:17:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-01-23 15:50:54.000000000 +0100 @@ -1,0 +2,6 @@ +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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.BR7nRj/_old 2014-01-23 15:50:54.000000000 +0100 +++ /var/tmp/diff_new_pack.BR7nRj/_new 2014-01-23 15:50:54.000000000 +0100 @@ -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 @@ 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 ++++++ os-prober-btrfsfix.patch ++++++ --- /var/tmp/diff_new_pack.BR7nRj/_old 2014-01-23 15:50:54.000000000 +0100 +++ /var/tmp/diff_new_pack.BR7nRj/_new 2014-01-23 15:50:54.000000000 +0100 @@ -314,7 +314,7 @@ + # 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org