Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2015-05-16 19:00:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-27 12:35:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-05-16 19:00:53.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 13 15:45:30 UTC 2015 - [email protected] + +- os-prober-btrfsfix-trim-leading-subvol.patch + * fix os-prober fails to detect other SLES12 installation (bsc#892364) + +------------------------------------------------------------------- New: ---- os-prober-btrfsfix-trim-leading-subvol.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.90FlaU/_old 2015-05-16 19:00:54.000000000 +0200 +++ /var/tmp/diff_new_pack.90FlaU/_new 2015-05-16 19:00:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package os-prober # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -56,6 +56,8 @@ Patch15: os-prober-call-dmraid-once.patch # PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista (bsc#910654) Patch16: os-prober-grep-for-windows-bcd-file.patch +# PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation (bsc#892364) +Patch17: os-prober-btrfsfix-trim-leading-subvol.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe @@ -93,6 +95,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 find . -name \*.orig -delete %build ++++++ os-prober-btrfsfix-trim-leading-subvol.patch ++++++ Index: os-prober/linux-boot-probes/mounted/common/40grub2 =================================================================== --- os-prober.orig/linux-boot-probes/mounted/common/40grub2 +++ os-prober/linux-boot-probes/mounted/common/40grub2 @@ -16,7 +16,7 @@ found_item=0 entry_result () { if [ "x$type" = "xbtrfs" -a "$rootsv" = "$bootsv" ]; then # trim off the leading subvol - kernelfile=$(echo "$kernel" | cut -d '/' -f 2- | cut -d '/' -f 2-) + kernelfile=$(echo "$kernel" | sed -e "s!^/${rootsv}/!!") else kernelfile=$kernel fi
