Tolerate different spellings of yaboot append

Make the yaboot parser more tolerant about the syntax of "append"
options (thanks, Hedayat Vatankhah; closes: #674561).

diff --git a/debian/changelog b/debian/changelog
index 3e908af..921eb18 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ os-prober (1.72) UNRELEASED; urgency=medium
   * Fix detection of /usr/ partition as a GNU/Linux root partition when
     /lib* directories are moved to /usr/ completely (thanks, Hedayat
     Vatankhah; closes: #698733).
+  * Make the yaboot parser more tolerant about the syntax of "append"
+    options (thanks, Hedayat Vatankhah; closes: #674561).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 17:11:49 +0000
 

diff --git a/linux-boot-probes/mounted/powerpc/40yaboot b/linux-boot-probes/mounted/powerpc/40yaboot
index 26d8a16..2bb6765 100755 (executable)
--- a/linux-boot-probes/mounted/powerpc/40yaboot
+++ b/linux-boot-probes/mounted/powerpc/40yaboot
@@ -74,8 +74,8 @@ parse_yaboot_conf () {
                                kernel="$(dequote "$2")"
                        ;;
                        append)
-                               shift 1
-                               parameters="$(dequote "${line#append=}")"
+                               cleanappend=`printf %s "$line" | sed 's/append\([[:space:]]\)*=\([[:space:]]\)*//'`
+                               parameters="$(dequote "$cleanappend")"
                        ;;
                        initrd)
                                initrd="$(dequote "$2")"