Merge lp:~mwhudson/debian-cd/live-server-cmdline-2 into lp:~ubuntu-cdimage/debian-cd/ubun3

[Michael Hudson-Doyle]

changes to live-server default kernel command line

[lp:~mwhudson/debian-cd/live-server-cmdline-2]

1985. By Michael Hudson-Doyle on 2018-02-12

leave quiet at default for live-server

[Steve Langasek (vorlon)]

review: Approve

[Michael Hudson-Doyle (mwhudson)]

This is merged but does not seem to have taken effect. Is there another deployment step required or did I mess something up?

[Steve Langasek (vorlon)]

On Sun, Mar 11, 2018 at 11:43:05PM -0000, Michael Hudson-Doyle wrote:

> This is merged but does not seem to have taken effect. Is there another
> deployment step required or did I mess something up?

Another deployment step. Sorry, deployed now.

=== modified file 'tools/boot/bionic/boot-amd64'
--- tools/boot/bionic/boot-amd64	2017-11-29 19:40:53 +0000
+++ tools/boot/bionic/boot-amd64	2018-02-12 21:18:56 +0000
@@ -417,12 +417,16 @@
 append normal=
 EOF
 if [ "$CDIMAGE_LIVE" = 1 ]; then
+    QUIET=quiet
+    SPLASH=splash
     if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
 	livelabel="^Start $HUMANPROJECT"
 	liveparams=' maybe-ubiquity'
     elif [ "$PROJECT" = ubuntu-server ]; then
 	livelabel="^Install $HUMANPROJECT"
-	liveparams=' union=aufs'
+	liveparams=' union=overlay'
+	DEFAULT_PRESEED=
+	SPLASH=
     else
 	livelabel="^Try $HUMANPROJECT without installing"
 	liveparams=
@@ -431,19 +435,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
@@ -452,18 +456,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