diff --git a/os-prober-btrfsfix-trim-leading-subvol.patch b/os-prober-btrfsfix-trim-leading-subvol.patch deleted file mode 100644 index 09877c1..0000000 --- a/os-prober-btrfsfix-trim-leading-subvol.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/os-prober.changes b/os-prober.changes index c4b259b..5be29bb 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 1 07:16:32 UTC 2015 - mchang@suse.com + +- Deleted os-prober-btrfsfix-trim-leading-subvol.patch: supersceded + by Improve-btrfs-handling-on-os-probing-for-grub2.patch + ------------------------------------------------------------------- Fri May 29 07:14:40 UTC 2015 - eich@suse.com diff --git a/os-prober.spec b/os-prober.spec index 0dc45dc..138d0be 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -1,7 +1,7 @@ # # spec file for package os-prober # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed