Merge lp:~xnox/debian-cd/subiquity into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

  Fix whitespace & drop OEM boot options from subiquity

  Currently kernel commandline string on subiquity images has multiple
  groups of duplicate whitespace. This is because most of the
  parameteres are empty for subiquity images and are concatenated space
  delimited. Instead of fiddling with optionality of each argument,
  simply parse them with $(echo ), such that shell escaping space
  separates all arguments without any double/tripple spacing.

  Also this makes reading the variable names easier.

  Create a variable indicating subiquity based images, to skip chunks of
  unneeded boot options. E.g. OEM boot is not supported by the subiquity
  images.

  Fix whitespace & drop OEM boot options from subiquity

  Currently kernel commandline string on subiquity images has multiple
  groups of duplicate whitespace. This is because most of the
  parameteres are empty for subiquity images and are concatenated space
  delimited. Instead of fiddling with optionality of each argument,
  simply parse them with $(echo ), such that shell escaping space
  separates all arguments without any double/tripple spacing.

  Also this makes reading the variable names easier.

  Create a variable indicating subiquity based images, to skip chunks of
  unneeded boot options. E.g. OEM boot is not supported by the subiquity
  images.

[Dimitri John Ledkov (xnox)]

review: Needs Resubmitting (rebase-to-focal)

Unmerged revisions

2028. By Dimitri John Ledkov on 2019-04-26

Fix whitespace & drop OEM boot options from subiquity

Currently kernel commandline string on subiquity images has multiple
groups of duplicate whitespace. This is because most of the
parameteres are empty for subiquity images and are concatenated space
delimited. Instead of fiddling with optionality of each argument,
simply parse them with $(echo ), such that shell escaping space
separates all arguments without any double/tripple spacing.

Also this makes reading the variable names easier.

Create a variable indicating subiquity based images, to skip chunks of
unneeded boot options. E.g. OEM boot is not supported by the subiquity
images.

=== modified file 'tools/boot/eoan/boot-amd64'
--- tools/boot/eoan/boot-amd64	2019-04-24 18:24:20 +0000
+++ tools/boot/eoan/boot-amd64	2019-04-26 13:02:57 +0000
@@ -447,7 +447,7 @@
 label live
   menu label $livelabel
   kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---
+  append $(echo $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams $LAYERFS_PATH_OPT initrd=$CASPER_INITRD $QUIET $SPLASH ---)
 EOF
 for variant in "" " (safe graphics)^ nomodeset"; do
     suffix="${variant%^*}"
@@ -455,7 +455,7 @@
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "${livelabel#^}${suffix}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
+	linux	$CASPER_KERNEL $(echo $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams $LAYERFS_PATH_OPT $QUIET $SPLASH $extra_kopt ---)
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -463,7 +463,7 @@
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "${livelabel#^}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
+	linux	$CASPER_KERNEL $(echo $KERNEL_PARAMS $DEFAULT_PRESEED $liveparams $LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---)
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -472,7 +472,7 @@
 label live-install
   menu label ^Install $HUMANPROJECT
   kernel $CASPER_KERNEL
-  append $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---
+  append $(echo $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity initrd=$CASPER_INITRD $QUIET $SPLASH ---)
 EOF
 	for variant in "" " (safe graphics)^ nomodeset"; do
 	    suffix="${variant%^*}"
@@ -480,14 +480,14 @@
 	    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Install $HUMANPROJECT${suffix}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
+	linux	$CASPER_KERNEL $(echo $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---)
 	initrd	$CASPER_INITRD
 }
 EOF
 	done
 	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
+	linux	$CASPER_KERNEL $(echo $KERNEL_PARAMS $DEFAULT_PRESEED $LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---)
 	initrd	$CASPER_INITRD
 }
 EOF
@@ -551,10 +551,12 @@
 EOF
     fi
 fi
+
 # The GRUB versions of this only correspond to single isolinux labels,
 # because we don't yet have the necessary technology in our GRUB menu stack
 # to have a two-dimensional set of boot options, as is implemented for
 # isolinux using the gfxboot "applies" keyword.
+if [ "$SUBIQUITY" == "0" ]; then
 for kp in $KERNEL_PREFIXES; do
 cat >> boot$N/isolinux/${!kp}gfxboot.cfg <<EOF
 label ${!kp}oem=OEM install (for manufacturers)
@@ -584,6 +586,8 @@
 EOF
 fi
 done
+fi
+
 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
     if [ "$PROJECT" != ubuntu-server ]; then
 	cat >> boot$N/isolinux/gfxboot.cfg <<EOF

=== modified file 'tools/boot/eoan/common.sh'
--- tools/boot/eoan/common.sh	2019-04-20 08:07:06 +0000
+++ tools/boot/eoan/common.sh	2019-04-26 13:02:57 +0000
@@ -35,7 +35,10 @@
 	    ;;
 	ubuntu-server)
 	    if [ "$CDIMAGE_LIVE" != 1 ]; then
-		DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
+	        DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
+	        SUBIQUITY=0
+	    else
+	        SUBIQUITY=1
 	    fi
 	    ;;
 	ubuntu-mid)