=== modified file 'data/vivid/yaboot/yaboot.conf.check'
--- data/vivid/yaboot/yaboot.conf.check	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.check	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=check
 	alias=check-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu --"
+	append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu ---"
 	initrd-size=8192
 	read-only
 
@@ -12,13 +12,13 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=check
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu --"
+	append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=check-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu --"
+	append="${FRONTEND_BACKGROUND} MENU=/bin/cdrom-checker-menu ---"
 	initrd-size=8192
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.check-live'
--- data/vivid/yaboot/yaboot.conf.check-live	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.check-live	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=check
 	alias=check-powerpc
 	initrd=${CASPER_POWERPC_INITRD}
-	append="boot=casper integrity-check quiet splash --"
+	append="boot=casper integrity-check quiet splash ---"
 	initrd-size=1048576
 	read-only
 
@@ -12,13 +12,13 @@
 image[macrisc4]=/casper/powerpc64/vmlinux
 	label=check
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="boot=casper integrity-check quiet splash --"
+	append="boot=casper integrity-check quiet splash ---"
 	initrd-size=1048576
 	read-only
 
 image=/casper/powerpc64/vmlinux
 	label=check-powerpc64
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="boot=casper integrity-check quiet splash --"
+	append="boot=casper integrity-check quiet splash ---"
 	initrd-size=1048576
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.cli'
--- data/vivid/yaboot/yaboot.conf.cli	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.cli	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=cli
 	alias=cli-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed ---"
 	initrd-size=8192
 	read-only
 
@@ -12,7 +12,7 @@
 	label=cli-free
 	alias=cli-free-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false ---"
 	initrd-size=8192
 	read-only
 
@@ -20,27 +20,27 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=cli
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed ---"
 	initrd-size=8192
 	read-only
 
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=cli-free
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=cli-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=cli-free-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/cli.seed apt-setup/restricted=false apt-setup/multiverse=false ---"
 	initrd-size=8192
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.install'
--- data/vivid/yaboot/yaboot.conf.install	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.install	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=install
 	alias=install-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${DEFAULT_PRESEED} quiet --"
+	append="${DEFAULT_PRESEED} quiet ---"
 	initrd-size=8192
 	read-only
 
@@ -12,7 +12,7 @@
 	label=install-free
 	alias=install-free-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false --"
+	append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false ---"
 	initrd-size=8192
 	read-only
 
@@ -20,27 +20,27 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=install
 	initrd=/install/powerpc64/initrd.gz
-	append="${DEFAULT_PRESEED} quiet --"
+	append="${DEFAULT_PRESEED} quiet ---"
 	initrd-size=8192
 	read-only
 
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=install-free
 	initrd=/install/powerpc64/initrd.gz
-	append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false --"
+	append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=install-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${DEFAULT_PRESEED} quiet --"
+	append="${DEFAULT_PRESEED} quiet ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=install-free-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false --"
+	append="${DEFAULT_PRESEED} quiet apt-setup/restricted=false apt-setup/multiverse=false ---"
 	initrd-size=8192
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.live'
--- data/vivid/yaboot/yaboot.conf.live	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.live	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=live
 	alias=live-powerpc
 	initrd=${CASPER_POWERPC_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper quiet splash --"
+	append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
 	initrd-size=1048576
 	read-only
 
@@ -12,7 +12,7 @@
 	label=live-nosplash
 	alias=live-nosplash-powerpc
 	initrd=${CASPER_POWERPC_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper quiet --"
+	append="${DEFAULT_PRESEED} boot=casper quiet ---"
 	initrd-size=1048576
 	read-only
 
@@ -20,7 +20,7 @@
 	label=driverupdates
 	alias=driverupdates-powerpc
 	initrd=${CASPER_POWERPC_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash --"
+	append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
 	initrd-size=1048576
 	read-only
 
@@ -28,41 +28,41 @@
 image[macrisc4]=/casper/powerpc64/vmlinux
 	label=live
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper quiet splash --"
+	append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
 	initrd-size=1048576
 	read-only
 
 image[macrisc4]=/casper/powerpc64/vmlinux
 	label=live-nosplash
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper quiet --"
+	append="${DEFAULT_PRESEED} boot=casper quiet ---"
 	initrd-size=1048576
 	read-only
 
 image[macrisc4]=/casper/powerpc64/vmlinux
 	label=driverupdates
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash --"
+	append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
 	initrd-size=1048576
 	read-only
 
 image=/casper/powerpc64/vmlinux
 	label=live-powerpc64
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper quiet splash --"
+	append="${DEFAULT_PRESEED} boot=casper quiet splash ---"
 	initrd-size=1048576
 	read-only
 
 image=/casper/powerpc64/vmlinux
 	label=live-nosplash-powerpc64
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper quiet --"
+	append="${DEFAULT_PRESEED} boot=casper quiet ---"
 	initrd-size=1048576
 	read-only
 
 image=/casper/powerpc64/vmlinux
 	label=driverupdates-powerpc64
 	initrd=${CASPER_POWERPC64_INITRD}
-	append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash --"
+	append="${DEFAULT_PRESEED} boot=casper debian-installer/driver-update=true quiet splash ---"
 	initrd-size=1048576
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.ltsp'
--- data/vivid/yaboot/yaboot.conf.ltsp	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.ltsp	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=ltsp-server
 	alias=ltsp-server-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed ---"
 	initrd-size=8192
 	read-only
 
@@ -12,13 +12,13 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=ltsp-server
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=ltsp-server-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/ltsp.seed ---"
 	initrd-size=8192
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.oem'
--- data/vivid/yaboot/yaboot.conf.oem	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.oem	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=oem
 	alias=oem-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${DEFAULT_PRESEED} oem-config/enable=true quiet --"
+	append="${DEFAULT_PRESEED} oem-config/enable=true quiet ---"
 	initrd-size=8192
 	read-only
 
@@ -12,13 +12,13 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=oem
 	initrd=/install/powerpc64/initrd.gz
-	append="${DEFAULT_PRESEED} oem-config/enable=true quiet --"
+	append="${DEFAULT_PRESEED} oem-config/enable=true quiet ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=oem-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${DEFAULT_PRESEED} oem-config/enable=true quiet --"
+	append="${DEFAULT_PRESEED} oem-config/enable=true quiet ---"
 	initrd-size=8192
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.rescue'
--- data/vivid/yaboot/yaboot.conf.rescue	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.rescue	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=rescue
 	alias=rescue-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${FRONTEND_BACKGROUND} rescue/enable=true --"
+	append="${FRONTEND_BACKGROUND} rescue/enable=true ---"
 	initrd-size=8192
 	read-only
 
@@ -12,13 +12,13 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=rescue
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} rescue/enable=true --"
+	append="${FRONTEND_BACKGROUND} rescue/enable=true ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=rescue-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} rescue/enable=true --"
+	append="${FRONTEND_BACKGROUND} rescue/enable=true ---"
 	initrd-size=8192
 	read-only

=== modified file 'data/vivid/yaboot/yaboot.conf.workstation'
--- data/vivid/yaboot/yaboot.conf.workstation	2014-10-24 20:13:50 +0000
+++ data/vivid/yaboot/yaboot.conf.workstation	2015-03-03 17:14:16 +0000
@@ -4,7 +4,7 @@
 	label=workstation
 	alias=workstation-powerpc
 	initrd=/install/powerpc/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet ---"
 	initrd-size=8192
 	read-only
 
@@ -12,13 +12,13 @@
 image[macrisc4]=/install/powerpc64/vmlinux
 	label=workstation
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet ---"
 	initrd-size=8192
 	read-only
 
 image=/install/powerpc64/vmlinux
 	label=workstation-powerpc64
 	initrd=/install/powerpc64/initrd.gz
-	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet --"
+	append="${FRONTEND_BACKGROUND} file=/cdrom/preseed/workstation.seed quiet ---"
 	initrd-size=8192
 	read-only

=== modified file 'tools/boot/vivid/boot-amd64'
--- tools/boot/vivid/boot-amd64	2015-01-12 15:59:57 +0000
+++ tools/boot/vivid/boot-amd64	2015-03-03 17:14:16 +0000
@@ -382,19 +382,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
@@ -403,18 +403,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
@@ -431,12 +431,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
@@ -445,12 +445,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
@@ -459,7 +459,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
@@ -491,7 +491,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
@@ -502,7 +502,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
@@ -529,12 +529,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
@@ -559,18 +559,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
@@ -579,12 +579,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
@@ -594,12 +594,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/vivid/boot-amd64+mac'
--- tools/boot/vivid/boot-amd64+mac	2015-02-04 14:27:21 +0000
+++ tools/boot/vivid/boot-amd64+mac	2015-03-03 17:14:16 +0000
@@ -357,12 +357,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
@@ -371,11 +371,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
@@ -392,21 +392,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
@@ -458,7 +458,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
@@ -481,11 +481,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
@@ -494,7 +494,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
@@ -502,7 +502,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/vivid/boot-armel+dove'
--- tools/boot/vivid/boot-armel+dove	2014-10-24 20:13:50 +0000
+++ tools/boot/vivid/boot-armel+dove	2015-03-03 17:14:16 +0000
@@ -119,7 +119,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/vivid/boot-i386'
--- tools/boot/vivid/boot-i386	2015-02-04 14:27:21 +0000
+++ tools/boot/vivid/boot-i386	2015-03-03 17:14:16 +0000
@@ -362,11 +362,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
@@ -375,11 +375,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
@@ -396,21 +396,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
@@ -462,7 +462,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
@@ -485,11 +485,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
@@ -498,7 +498,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
@@ -506,7 +506,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