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

[Michael Hudson-Doyle]

I didn't try to make these changes minimal, I just broke live-server out into its own section. I don't know if the configs apart from $CDDIR/boot/grub/grub.cfg make any sense in this context.

[Michael Hudson-Doyle (mwhudson)]

In case it's not obvious, I have no idea at all how to test these changes :/

[Michael Hudson-Doyle (mwhudson)]

Ah of course you can test this at least somewhat by editing the command line interactively, which I did and found that it's boot=overlay not boot=overlayfs...

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

1986. By Michael Hudson-Doyle on 2018-01-15

union=overlay, not overlayfs

[Adam Conrad (adconrad)]

Rejected, per IRC discussion.

Unmerged revisions

1986. By Michael Hudson-Doyle on 2018-01-15

union=overlay, not overlayfs

1985. By Michael Hudson-Doyle on 2018-01-15

come on, it's 2018, let's use overlayfs

1984. By Michael Hudson-Doyle on 2018-01-15

tweak live-server command lines

 * remove 'quiet splash'
 * add console=ttyS0 console=tty1 so there is some life on a reasonably sane
   default for a serial console.

=== 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-01-15 10:12:27 +0000
@@ -417,62 +417,85 @@
 append normal=
 EOF
 if [ "$CDIMAGE_LIVE" = 1 ]; then
-    if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
-	livelabel="^Start $HUMANPROJECT"
-	liveparams=' maybe-ubiquity'
-    elif [ "$PROJECT" = ubuntu-server ]; then
-	livelabel="^Install $HUMANPROJECT"
-	liveparams=' union=aufs'
+    if [ "$PROJECT" = ubuntu-server ]; then
+        livelabel="^Install $HUMANPROJECT"
+	liveopts='boot=casper union=overlay'
+        systemdopts='console=ttyS0 console=tty1'
+        cat >> boot$N/isolinux/txt.cfg <<EOF
+label live
+  menu label $livelabel
+  kernel $CASPER_KERNEL
+  append $KERNEL_PARAMS $liveopts initrd=$CASPER_INITRD --- $systemdopts
+EOF
+        cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+menuentry "${livelabel#^}" {
+	set gfxpayload=keep
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $liveopts --- $systemdopts
+	initrd	$CASPER_INITRD
+}
+EOF
+        cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
+menuentry "${livelabel#^}" {
+	set gfxpayload=keep
+	linux	$CASPER_KERNEL $KERNEL_PARAMS $liveopts iso-scan/filename=\${iso_path} --- $systemdopts
+	initrd	$CASPER_INITRD
+}
+EOF
     else
-	livelabel="^Try $HUMANPROJECT without installing"
-	liveparams=
-    fi
-    cat >> boot$N/isolinux/txt.cfg <<EOF
+        if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
+	    livelabel="^Start $HUMANPROJECT"
+	    liveparams=' maybe-ubiquity'
+        else
+	    livelabel="^Try $HUMANPROJECT without installing"
+	    liveparams=
+        fi
+        cat >> boot$N/isolinux/txt.cfg <<EOF
 label live
   menu label $livelabel
   kernel $CASPER_KERNEL
   append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper$liveparams initrd=$CASPER_INITRD quiet splash ---
 EOF
-    cat >> $CDDIR/boot/grub/grub.cfg <<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 ---
 	initrd	$CASPER_INITRD
 }
 EOF
-    cat >> $CDDIR/boot/grub/loopback.cfg <<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 ---
 	initrd	$CASPER_INITRD
 }
 EOF
-    if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
-	cat >> boot$N/isolinux/txt.cfg <<EOF
+        if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
+	    cat >> boot$N/isolinux/txt.cfg <<EOF
 label live-install
   menu label ^Install $HUMANPROJECT
   kernel $CASPER_KERNEL
   append $KERNEL_PARAMS $DEFAULT_PRESEED boot=casper only-ubiquity initrd=$CASPER_INITRD quiet splash ---
 EOF
-	cat >> $CDDIR/boot/grub/grub.cfg <<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 ---
 	initrd	$CASPER_INITRD
 }
 EOF
-	cat >> $CDDIR/boot/grub/loopback.cfg <<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 ---
 	initrd	$CASPER_INITRD
 }
 EOF
-    fi
-    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
+        fi
+        cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label driverupdates=Use driver update disc
 append driverupdates=debian-installer/driver-update=true
 applies driverupdates=live live-install
 EOF
+    fi
 fi
 if [ "$CDIMAGE_INSTALL" = 1 ]; then
     if [ "$CDIMAGE_LIVE" != 1 ]; then