diff -Nru debian-installer-20101020ubuntu366/build/boot/ppc64el/grub-cdrom.cfg debian-installer-20101020ubuntu367/build/boot/ppc64el/grub-cdrom.cfg
--- debian-installer-20101020ubuntu366/build/boot/ppc64el/grub-cdrom.cfg	2014-04-11 12:52:44.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/ppc64el/grub-cdrom.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,11 +1,11 @@
 set timeout=-1
 
 menuentry "Install" {
-	linux	${KERNEL} tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false -- quiet
+	linux	${KERNEL} tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false --- quiet
 	initrd	${INITRD}
 }
 
 menuentry "Rescue mode" {
-	linux	${KERNEL} rescue/enable=true -- quiet
+	linux	${KERNEL} rescue/enable=true --- quiet
 	initrd	${INITRD}
 }
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/adgtk.cfg debian-installer-20101020ubuntu367/build/boot/x86/adgtk.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/adgtk.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/adgtk.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -4,5 +4,5 @@
 label expertgui
 	menu label Graphical expert install
 	kernel ${KERNEL}
-	append priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
+	append priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- ${CONSOLE}
 include ${SYSDIR}rqgtk.cfg
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/adtxt.cfg debian-installer-20101020ubuntu367/build/boot/x86/adtxt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/adtxt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/adtxt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,9 +1,9 @@
 label expert
 	menu label ^Expert install
 	kernel ${KERNEL}
-	append priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
+	append priority=low ${VIDEO_MODE} initrd=${INITRD} --- ${CONSOLE}
 label cli-expert
 	menu label Command-^line expert install
 	kernel ${KERNEL}
-	append tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
+	append tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false priority=low ${VIDEO_MODE} initrd=${INITRD} --- ${CONSOLE}
 include ${SYSDIR}rqtxt.cfg
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/adgtkdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/adgtkdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/adgtkdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/adgtkdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -4,8 +4,8 @@
 label expertgui-%desktop%
 	menu label Graphical expert install
 	kernel ${KERNEL}
-	append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- ${CONSOLE}
+	append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- ${CONSOLE}
 label autogui-%desktop%
 	menu label Graphical automated install
 	kernel ${KERNEL}
-	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
+	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/adtxtdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/adtxtdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/adtxtdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/adtxtdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,8 +1,8 @@
 label expert-%desktop%
 	menu label ^Expert install
 	kernel ${KERNEL}
-	append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} -- ${CONSOLE}
+	append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${INITRD} --- ${CONSOLE}
 label auto-%desktop%
 	menu label ^Automated install
 	kernel ${KERNEL}
-	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdagdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdagdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdagdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdagdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,8 +1,8 @@
 label amd64-expertgui-%desktop%
 	menu label 64 bit graphical expert install
 	kernel ${AMD_KERNEL}
-	append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- ${CONSOLE}
+	append desktop=%desktop% priority=low ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} --- ${CONSOLE}
 label amd64-autogui-%desktop%
 	menu label 64 bit graphical automated install
 	kernel ${AMD_KERNEL}
-	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
+	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdatdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdatdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdatdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdatdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -4,8 +4,8 @@
 label amd64-expert-%desktop%
 	menu label 64 bit expert install
 	kernel ${AMD_KERNEL}
-	append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${AMD_INITRD} -- ${CONSOLE}
+	append desktop=%desktop% priority=low ${VIDEO_MODE} initrd=${AMD_INITRD} --- ${CONSOLE}
 label amd64-auto-%desktop%
 	menu label 64 bit automated install
 	kernel ${AMD_KERNEL}
-	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
+	append desktop=%desktop% auto=true priority=critical ${VIDEO_MODE} initrd=${AMD_INITRD} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdgtkdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdgtkdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdgtkdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdgtkdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,4 +1,4 @@
 label amd64-installgui-%desktop%
 	menu label 64 bit graphical install
 	kernel ${AMD_KERNEL}
-	append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} -- quiet ${CONSOLE}
+	append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${AMD_INITRD_GTK} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdtxtdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdtxtdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/amdtxtdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/amdtxtdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -3,4 +3,4 @@
 	menu label ^64 bit install
 	menu default64
 	kernel ${AMD_KERNEL}
-	append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} -- quiet ${CONSOLE}
+	append desktop=%desktop% ${VIDEO_MODE} initrd=${AMD_INITRD} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/gtkdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/gtkdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/gtkdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/gtkdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,4 +1,4 @@
 label installgui-%desktop%
 	menu label ^Graphical install
 	kernel ${KERNEL}
-	append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
+	append desktop=%desktop% ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/desktop/txtdt.cfg debian-installer-20101020ubuntu367/build/boot/x86/desktop/txtdt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/desktop/txtdt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/desktop/txtdt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -3,4 +3,4 @@
 	menu label ^Install
 	menu default
 	kernel ${KERNEL}
-	append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+	append desktop=%desktop% ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/grub/grub-efi.cfg debian-installer-20101020ubuntu367/build/boot/x86/grub/grub-efi.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/grub/grub-efi.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/grub/grub-efi.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -12,30 +12,30 @@
 
 menuentry "Install" {
 	set gfxpayload=keep
-	linux	${KERNEL} -- quiet
+	linux	${KERNEL} --- quiet
 	initrd	${INITRD}
 }
 
 menuentry "Command-line install" {
 	set gfxpayload=keep
-	linux	${KERNEL} tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false -- quiet
+	linux	${KERNEL} tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false --- quiet
 	initrd	${INITRD}
 }
 
 menuentry "Expert install" {
 	set gfxpayload=keep
-	linux	${KERNEL} priority=low --
+	linux	${KERNEL} priority=low ---
 	initrd	${INITRD}
 }
 
 menuentry "Command-line expert install" {
 	set gfxpayload=keep
-	linux	${KERNEL} tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false priority=low --
+	linux	${KERNEL} tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false priority=low ---
 	initrd	${INITRD}
 }
 
 menuentry "Rescue mode" {
 	set gfxpayload=keep
-	linux	${KERNEL} rescue/enable=true -- quiet
+	linux	${KERNEL} rescue/enable=true --- quiet
 	initrd	${INITRD}
 }
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/gtk.cfg debian-installer-20101020ubuntu367/build/boot/x86/gtk.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/gtk.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/gtk.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,4 +1,4 @@
 label installgui
 	menu label ^Graphical install
 	kernel ${KERNEL}
-	append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} -- quiet ${CONSOLE}
+	append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/rqgtk.cfg debian-installer-20101020ubuntu367/build/boot/x86/rqgtk.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/rqgtk.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/rqgtk.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,4 +1,4 @@
 label rescuegui
 	menu label Graphical rescue mode
 	kernel ${KERNEL}
-	append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true -- quiet  ${CONSOLE}
+	append ${VIDEO_MODE_GTK} initrd=${INITRD_GTK} rescue/enable=true --- quiet  ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/rqtxt.cfg debian-installer-20101020ubuntu367/build/boot/x86/rqtxt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/rqtxt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/rqtxt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -1,4 +1,4 @@
 label rescue
 	menu label ^Rescue mode
 	kernel ${KERNEL}
-	append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true -- quiet ${CONSOLE}
+	append ${VIDEO_MODE} initrd=${INITRD} rescue/enable=true --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/txt.cfg debian-installer-20101020ubuntu367/build/boot/x86/txt.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/txt.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/txt.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -3,8 +3,8 @@
 	menu label ^Install
 	menu default
 	kernel ${KERNEL}
-	append ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+	append ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
 label cli
 	menu label ^Command-line install
 	kernel ${KERNEL}
-	append tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false ${VIDEO_MODE} initrd=${INITRD} -- quiet ${CONSOLE}
+	append tasks=standard pkgsel/language-pack-patterns= pkgsel/install-language-support=false ${VIDEO_MODE} initrd=${INITRD} --- quiet ${CONSOLE}
diff -Nru debian-installer-20101020ubuntu366/build/boot/x86/xen/xm-debian.cfg debian-installer-20101020ubuntu367/build/boot/x86/xen/xm-debian.cfg
--- debian-installer-20101020ubuntu366/build/boot/x86/xen/xm-debian.cfg	2012-12-12 21:11:36.000000000 +0000
+++ debian-installer-20101020ubuntu367/build/boot/x86/xen/xm-debian.cfg	2015-03-02 15:49:47.000000000 +0000
@@ -260,7 +260,7 @@
     # Reboot will just restart the installer since this file is not
     # reparsed, so halt and restart that way.
     extras.append("debian-installer/exit/always_halt=true")
-    extras.append("--")
+    extras.append("---")
     extras.append("quiet")
 
     console="hvc0"
diff -Nru debian-installer-20101020ubuntu366/debian/changelog debian-installer-20101020ubuntu367/debian/changelog
--- debian-installer-20101020ubuntu366/debian/changelog	2015-02-27 10:58:22.000000000 +0000
+++ debian-installer-20101020ubuntu367/debian/changelog	2015-03-02 15:50:11.000000000 +0000
@@ -1,3 +1,10 @@
+debian-installer (20101020ubuntu367) vivid; urgency=medium
+
+  * Cherry-pick from upstream 10af2f56; with fixup: (LP: #1427252)
+    - Use --- as options separator for all Linux command lines.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Mon, 02 Mar 2015 10:50:09 -0500
+
 debian-installer (20101020ubuntu366) vivid; urgency=medium
 
   * Copy apm-mustang.dtb from its new location (LP: #1408004)