Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2018-12-19 13:26:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Wed Dec 19 13:26:15 2018 rev:49 rq:657083 version:1.76 Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2018-11-06 15:33:39.639768698 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new.28833/os-prober.changes 2018-12-19 13:26:26.913160318 +0100 @@ -1,0 +2,6 @@ +Tue Dec 11 07:30:19 UTC 2018 - [email protected] + +- Don't hard require btrfsprogs by downgrading it to suggests (boo#1118279) + * os-prober-make-btrfsprogs-optional.patch + +------------------------------------------------------------------- New: ---- os-prober-make-btrfsprogs-optional.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.tD54M0/_old 2018-12-19 13:26:27.537159558 +0100 +++ /var/tmp/diff_new_pack.tD54M0/_new 2018-12-19 13:26:27.541159554 +0100 @@ -68,15 +68,17 @@ Patch25: os-prober-05efi-blkid.patch # PATCH-FIX-OPENSUSE: UEFI Grub does not insert Arch Linux entry correctly (boo#1101942) Patch26: os-prober-multiple-initrd.patch +# PATCH-FIX-OPENSUSE: os-prober unconditionally pulls btrfsprogs (boo#1118279) +Patch27: os-prober-make-btrfsprogs-optional.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe -Requires: btrfsprogs Requires: coreutils Requires: udev Requires: util-linux Recommends: dmraid Suggests: lvm2 +Suggests: btrfsprogs %if 0%{?suse_version} >= 1315 # For logger utility Requires: util-linux-systemd @@ -111,6 +113,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 find . -name \*.orig -delete %build ++++++ os-prober-make-btrfsprogs-optional.patch ++++++ Index: os-prober-1.76/os-probes/common/50mounted-tests =================================================================== --- os-prober-1.76.orig/os-probes/common/50mounted-tests +++ os-prober-1.76/os-probes/common/50mounted-tests @@ -151,11 +151,20 @@ if [ "$types" = btrfs ]; then rmdir "$tmpmnt" || true exit 1 fi - # besides regular subvols, get ro and snapshot so thet can be excluded - subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!) - rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!) - sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' -f 14 | sed -e s!^\<FS_TREE\>/!!) - defaultvol=$(btrfs subvolume get-default "$tmpmnt" | cut -d ' ' -f 9) + + if type btrfs >/dev/null 2>&1; then + # besides regular subvols, get ro and snapshot so thet can be excluded + subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!) + rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!) + sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' -f 14 | sed -e s!^\<FS_TREE\>/!!) + defaultvol=$(btrfs subvolume get-default "$tmpmnt" | cut -d ' ' -f 9) + else + subvols="" + rosubvols="" + sssubvols="" + defaultvol="" + fi + if ! umount "$tmpmnt"; then warn "failed to umount btrfs volume on $tmpmnt" rmdir "$tmpmnt" || true
