From 29005457691741df1a7b3e997391d70b76b49bfe Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Thu, 6 Nov 2014 12:55:59 +0000
Subject: [PATCH] Change from -- to --- for kernel command line handling

Closes: #764676
---
 data/jessie/pegasos/pegasos   | 8 ++++----
 data/jessie/yaboot/mac32.conf | 8 ++++----
 debian/changelog              | 2 ++
 tools/boot/jessie/boot-x86    | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/data/jessie/pegasos/pegasos b/data/jessie/pegasos/pegasos
index 80b607fa..f33e87df 100644
--- a/data/jessie/pegasos/pegasos
+++ b/data/jessie/pegasos/pegasos
@@ -37,10 +37,10 @@
 : my-boot-case ( num -- )
   ."  " cr
   case
-    1 of " cd install/powerpc/vmlinuz-chrp.initrd --" endof
-    2 of " cd install/powerpc/vmlinuz-chrp.initrd priority=low --" endof
-    3 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true --" endof
-    4 of " cd install/powerpc/vmlinuz-chrp.initrd auto=true priority=critical --" endof
+    1 of " cd install/powerpc/vmlinuz-chrp.initrd ---" endof
+    2 of " cd install/powerpc/vmlinuz-chrp.initrd priority=low ---" endof
+    3 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true ---" endof
+    4 of " cd install/powerpc/vmlinuz-chrp.initrd auto=true priority=critical ---" endof
     5 of " none" endof
   endcase
   $boot
diff --git a/data/jessie/yaboot/mac32.conf b/data/jessie/yaboot/mac32.conf
index 066ad9d4..b4db2a88 100644
--- a/data/jessie/yaboot/mac32.conf
+++ b/data/jessie/yaboot/mac32.conf
@@ -9,27 +9,27 @@ message=/install/boot32.msg
 image=/install/powerpc/vmlinux
 	label=install
 	initrd=/install/powerpc/initrd.gz
-	append="--"
+	append="---"
 	initrd-size=10240
 	read-only
 
 image=/install/powerpc/vmlinux
 	label=expert
 	initrd=/install/powerpc/initrd.gz
-	append="priority=low --"
+	append="priority=low ---"
 	initrd-size=10240
 	read-only
 
 image=/install/powerpc/vmlinux
 	label=rescue
 	initrd=/install/powerpc/initrd.gz
-	append="rescue/enable=true --"
+	append="rescue/enable=true ---"
 	initrd-size=10240
 	read-only
 
 image=/install/powerpc/vmlinux
 	label=auto
 	initrd=/install/powerpc/initrd.gz
-	append="auto=true priority=critical --"
+	append="auto=true priority=critical ---"
 	initrd-size=10240
 	read-only
diff --git a/debian/changelog b/debian/changelog
index f69be911..de26fdcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
     patch from Michael Vogt - thanks!
   * Add 586 kernels to replace 486 for i386 CDs
   * More tweaks for arm64 CD building
+  * Change from -- to --- for kernel command line handling.
+    Closes: #764676
 
  -- Steve McIntyre <93sam@debian.org>  Wed, 29 Oct 2014 17:33:10 +0000
 
diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
index 8b16ba63..9148e111 100644
--- a/tools/boot/jessie/boot-x86
+++ b/tools/boot/jessie/boot-x86
@@ -369,7 +369,7 @@ if [ -n "$KERNEL_PARAMS" ]; then
 			instsel.cfg)
 				continue ;;
 		esac
-		sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
+		sed -i "/^[[:space:]]\+append .*---/ s|append|append $KERNEL_PARAMS|" \
 			$file
 	done
 fi