Merge lp:~cyphermox/debian-cd/kernel-cli-separator-trusty into lp:~ubuntu-cdimage/debian-cd/ubun3

[Mathieu Trudel-Lapierre]

Fix the kernel command-line separator for options to pass on to the installed system and such; using --- also makes sure the kernel doesn't just ignore anything passed after a simple '--'.

=== modified file 'tools/boot/trusty/boot-amd64'
--- tools/boot/trusty/boot-amd64	2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-amd64	2016-02-24 19:25:48 +0000
@@ -384,19 +384,19 @@
 label live
   menu label $livelabel
   kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
 EOF
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "${livelabel#^}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "${livelabel#^}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -405,18 +405,18 @@
 label live-install
   menu label ^Install $HUMANPROJECT
   kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
 EOF
 	cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
 	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -433,12 +433,12 @@
 label install
   menu label ^Install $HUMANPROJECT
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
 EOF
 	cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
 	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --
+	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
 	initrd	/install/initrd.gz
 }
 EOF
@@ -447,12 +447,12 @@
 label install
   menu label ^Install $HUMANPROJECT in text mode
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
 EOF
 	cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Install $HUMANPROJECT in text mode" {
 	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet --
+	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet ---
 	initrd	/install/initrd.gz
 }
 EOF
@@ -461,7 +461,7 @@
 label expert
   menu hide
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
 EOF
     if [ "$PROJECT" = edubuntu ]; then
 	cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -493,7 +493,7 @@
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "OEM install (for manufacturers)" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity quiet splash oem-config/enable=true ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -504,7 +504,7 @@
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "OEM install (for manufacturers)" {
 	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true --
+	linux	/install/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED quiet oem-config/enable=true ---
 	initrd	/install/initrd.gz
 }
 EOF
@@ -531,12 +531,12 @@
 label cloud
   menu label ^Multiple server install with MAAS
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
 EOF
 	cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Multiple server install with MAAS" {
 	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
+	linux	/install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
 	initrd	/install/initrd.gz
 }
 EOF
@@ -561,18 +561,18 @@
 label check
   menu label ^Check disc for defects
   kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
 EOF
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Check disc for defects" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Check disc for defects" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
+	linux	$CASPER_KERNEL $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -581,12 +581,12 @@
 label check
   menu label ^Check disc for defects
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Check disc for defects" {
 	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet --
+	linux	/install/vmlinuz $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---
 	initrd	/install/initrd.gz
 }
 EOF
@@ -596,12 +596,12 @@
 label rescue
   menu label ^Rescue a broken system
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
 EOF
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Rescue a broken system" {
 	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS rescue/enable=true --
+	linux	/install/vmlinuz $KERNEL_PARAMS rescue/enable=true ---
 	initrd	/install/initrd.gz
 }
 EOF

=== modified file 'tools/boot/trusty/boot-amd64+mac'
--- tools/boot/trusty/boot-amd64+mac	2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-amd64+mac	2016-02-24 19:25:48 +0000
@@ -360,12 +360,12 @@
 label live
   menu label $livelabel
   kernel /casper/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "${livelabel#^}" {
 	set gfxpayload=keep
-	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
+	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -374,11 +374,11 @@
 label live-install
   menu label ^Install $HUMANPROJECT
   kernel /casper/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
 EOF
 	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
-	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
+	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -395,21 +395,21 @@
 label install
   menu label ^Install $HUMANPROJECT
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     else
 	cat >> boot$N/isolinux/txt.cfg <<EOF
 label install
   menu label ^Install $HUMANPROJECT in text mode
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     fi
     cat >> boot$N/isolinux/adtxt.cfg <<EOF
 label expert
   menu hide
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
 EOF
     if [ "$PROJECT" = edubuntu ]; then
 	cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -461,7 +461,7 @@
 label cloud
   menu label ^Multiple server install with MAAS
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     fi
 fi
@@ -484,11 +484,11 @@
 label check
   menu label ^Check disc for defects
   kernel /casper/vmlinuz
-  append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Check disc for defects" {
-	linux	/casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
+	linux	/casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -497,7 +497,7 @@
 label check
   menu label ^Check disc for defects
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
 EOF
 fi
 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
@@ -505,7 +505,7 @@
 label rescue
   menu label ^Rescue a broken system
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
 EOF
 fi
 cat >> boot$N/isolinux/txt.cfg <<EOF

=== modified file 'tools/boot/trusty/boot-armel+dove'
--- tools/boot/trusty/boot-armel+dove	2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-armel+dove	2016-02-24 19:25:48 +0000
@@ -120,7 +120,7 @@
 	uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$FLAVOUR"
 	uboot_kernel="/casper/uImage"
 	uboot_initrd="/casper/uInitrd"
-	uboot_extra_cmdline=" -- boot=casper"
+	uboot_extra_cmdline=" --- boot=casper"
     fi
 
     if [ "$do_uboot" ]; then

=== modified file 'tools/boot/trusty/boot-i386'
--- tools/boot/trusty/boot-i386	2015-08-05 22:52:14 +0000
+++ tools/boot/trusty/boot-i386	2016-02-24 19:25:48 +0000
@@ -364,11 +364,11 @@
 label live
   menu label $livelabel
   kernel /casper/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "${livelabel#^}" {
-	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash --
+	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -377,11 +377,11 @@
 label live-install
   menu label ^Install $HUMANPROJECT
   kernel /casper/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
 EOF
 	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
-	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash --
+	linux	/casper/vmlinuz $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -398,21 +398,21 @@
 label install
   menu label ^Install $HUMANPROJECT
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     else
 	cat >> boot$N/isolinux/txt.cfg <<EOF
 label install
   menu label ^Install $HUMANPROJECT in text mode
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     fi
     cat >> boot$N/isolinux/adtxt.cfg <<EOF
 label expert
   menu hide
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz --
+  append $KERNEL_PARAMS $DEFAULT_PRESEED priority=low vga=788 initrd=/install/initrd.gz ---
 EOF
     if [ "$PROJECT" = edubuntu ]; then
 	cat >> boot$N/isolinux/gfxboot.cfg <<EOF
@@ -464,7 +464,7 @@
 label cloud
   menu label ^Multiple server install with MAAS
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
 EOF
     fi
 fi
@@ -487,11 +487,11 @@
 label check
   menu label ^Check disc for defects
   kernel /casper/vmlinuz
-  append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash --
+  append $KERNEL_PARAMS boot=casper integrity-check initrd=$CASPER_INITRD quiet splash ---
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Check disc for defects" {
-	linux	/casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash --
+	linux	/casper/vmlinuz $KERNEL_PARAMS boot=casper integrity-check iso-scan/filename=\${iso_path} quiet splash ---
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -500,7 +500,7 @@
 label check
   menu label ^Check disc for defects
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND MENU=/bin/cdrom-checker-menu vga=788 initrd=/install/initrd.gz quiet ---
 EOF
 fi
 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
@@ -508,7 +508,7 @@
 label rescue
   menu label ^Rescue a broken system
   kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz --
+  append $KERNEL_PARAMS $FRONTEND_BACKGROUND rescue/enable=true vga=788 initrd=/install/initrd.gz ---
 EOF
 fi
 cat >> boot$N/isolinux/txt.cfg <<EOF

=== modified file 'tools/boot/trusty/post-boot-armel+omap'
--- tools/boot/trusty/post-boot-armel+omap	2013-10-18 14:52:32 +0000
+++ tools/boot/trusty/post-boot-armel+omap	2016-02-24 19:25:48 +0000
@@ -139,7 +139,7 @@
     uboot_desc="Ubuntu LiveCD"
     uboot_input_kernel="$CDDIR/casper/filesystem.kernel-$SUBARCH"
     uboot_input_initrd="$CDDIR/casper/filesystem.initrd-$SUBARCH"
-    uboot_extra_cmdline=" fixrtc quiet splash -- boot=casper only-ubiquity"
+    uboot_extra_cmdline=" fixrtc quiet splash --- boot=casper only-ubiquity"
 fi
 
 if [ "$CDIMAGE_PREINSTALLED" = 1 ]; then