[os-prober] Fix yaboot.conf parsing and a patch reorder

[Hedayat Vatankhah]

commit 415df3509e88e2e9efea083ef35857aea7912096
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Fri May 25 16:24:42 2012 +0430

    Fix yaboot.conf parsing and a patch reorder
    
    - mdraid patch appeared first, so move it upper :P

 os-prober-yaboot-parsefix.patch |   14 ++++++++++++++
 os-prober.spec                  |   15 ++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/os-prober-yaboot-parsefix.patch b/os-prober-yaboot-parsefix.patch
new file mode 100644
index 0000000..57badc0
--- /dev/null
+++ b/os-prober-yaboot-parsefix.patch
@@ -0,0 +1,14 @@
+diff -up os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot.parsefix os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot
+--- os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot.parsefix	2012-05-25 15:57:13.477647064 +0430
++++ os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot	2012-05-25 16:16:58.844827933 +0430
+@@ -74,8 +74,8 @@ parse_yaboot_conf () {
+ 				kernel="$(dequote "$2")"
+ 			;;
+ 			append)
+-				shift 1
+-				parameters="$(dequote "${line#append=}")"
++				cleanappend=`printf %s "$line" | sed -E 's/append(\s)*=(\s)*//'`
++				parameters="$(dequote "$cleanappend")"
+ 			;;
+ 			initrd)
+ 				initrd="$(dequote "$2")"
diff --git a/os-prober.spec b/os-prober.spec
index f7e0f5f..ad55858 100644
--- a/os-prober.spec
+++ b/os-prober.spec
@@ -13,8 +13,9 @@ Source0:        http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{
 Patch0:         os-prober-newnsdirfix.patch
 Patch1:         os-porber-no-dummy-mach-kernel.patch
 # Sent upstream
-Patch2:         os-prober-grub2-fedorafix.patch
-Patch3:         os-prober-mdraidfix.patch
+Patch2:         os-prober-mdraidfix.patch
+Patch3:         os-prober-grub2-fedorafix.patch
+Patch4:         os-prober-yaboot-parsefix.patch
 
 Requires:       udev coreutils util-linux
 Requires:       grep /bin/sed /sbin/modprobe
@@ -28,8 +29,10 @@ distributions can be added easily.
 %setup -q
 %patch0 -p1 -b .newnsdirfix
 %patch1 -p1 -b .macosxdummyfix
-%patch2 -p1 -b .grub2-fedorafix
-%patch3 -p1 -b .mdraidfix
+%patch2 -p1 -b .mdraidfix
+%patch3 -p1 -b .grub2-fedorafix
+%patch4 -p1 -b .yaboot-parsefix
+
 find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
 sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
      linux-boot-probes/common/50mounted-tests
@@ -80,9 +83,11 @@ fi
 
 %changelog
 * Fri May 25 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.53-2
+- Add support for OSes installed on Linux mdraid partitions, bug #752402
 - Add Fedora's grub2 config path, fixes generating menu entries for other
   installed Fedora's
-- Add support for OSes installed on Linux mdraid partitions, bug #752402
+- Fixed bug in parsing yaboot.conf: accept spaces around '=' for append, 
+  bug #825041
 
 * Fri May 11 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 1.53-1
 - Updated to 1.53 for a bugfix