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

[Dimitri John Ledkov]

Drop maas, it's now doing a deb2snap transition

=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64	2020-01-15 16:36:10 +0000
+++ tools/boot/focal/boot-amd64	2020-02-18 17:48:16 +0000
@@ -605,34 +605,6 @@
 applies ${!kp}minimalvm=${!kp}install
 EOF
     done
-        # This really ought to be in gfxboot.cfg instead, but we want to
-        # make it particularly prominent.
-        cat >> boot$N/isolinux/txt.cfg <<EOF
-label maas
-  menu label ^Install MAAS Region Controller
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-region-udeb vga=788 initrd=/install/initrd.gz quiet ---
-
-label maasrack
-  menu label ^Install MAAS Rack Controller
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-rack-udeb vga=788 initrd=/install/initrd.gz quiet ---
-EOF
-    for kp in $KERNEL_PREFIXES; do
-	cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "Install MAAS Region Controller" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-region-udeb vga=788 initrd=/install/${!kp}initrd.gz quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-
-menuentry "Install MAAS Rack Controller" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb vga=788 initrd=/install/${!kp}initrd.gz quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-    done
     fi
 fi
 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then

=== modified file 'tools/boot/focal/boot-amd64+mac'
--- tools/boot/focal/boot-amd64+mac	2019-10-18 23:26:51 +0000
+++ tools/boot/focal/boot-amd64+mac	2020-02-18 17:48:16 +0000
@@ -460,14 +460,6 @@
 replace minimalvm=file=/cdrom/preseed/ubuntu-server-minimalvm.seed
 applies minimalvm=install
 EOF
-        # This really ought to be in gfxboot.cfg instead, but we want to
-        # make it particularly prominent.
-        cat >> boot$N/isolinux/txt.cfg <<EOF
-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 ---
-EOF
     fi
 fi
 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then

=== modified file 'tools/boot/focal/boot-arm64'
--- tools/boot/focal/boot-arm64	2019-10-18 23:26:51 +0000
+++ tools/boot/focal/boot-arm64	2020-02-18 17:48:16 +0000
@@ -247,25 +247,6 @@
 EOF
   done
 fi
-if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
-    if [ "$PROJECT" = ubuntu-server ]; then
-    for kp in $KERNEL_PREFIXES; do
-	cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "Install MAAS Region Controller" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-region-udeb initrd=/install/${!kp}initrd.gz quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-
-menuentry "Install MAAS Rack Controller" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb initrd=/install/${!kp}initrd.gz quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-    done
-    fi
-fi
 if [ "$CDIMAGE_LIVE" = 1 ]; then
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Check disc for defects" {

=== modified file 'tools/boot/focal/boot-i386'
--- tools/boot/focal/boot-i386	2019-10-18 23:26:51 +0000
+++ tools/boot/focal/boot-i386	2020-02-18 17:48:16 +0000
@@ -504,14 +504,6 @@
 applies ${!kp}minimalvm=${!kp}install
 EOF
     done
-	# This really ought to be in gfxboot.cfg instead, but we want to
-	# make it particularly prominent.
-	cat >> boot$N/isolinux/txt.cfg <<EOF
-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 ---
-EOF
     fi
 fi
 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then

=== modified file 'tools/boot/focal/boot-ppc64el'
--- tools/boot/focal/boot-ppc64el	2019-10-18 23:26:51 +0000
+++ tools/boot/focal/boot-ppc64el	2020-02-18 17:48:16 +0000
@@ -145,19 +145,6 @@
 
   if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
     cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
-menuentry "Install MAAS Region Controller${!kp:+ (HWE)}" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinux $KERNEL_PARAMS modules=maas-region-udeb initrd=/install/${!kp}initrd.gz quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-
-menuentry "Install MAAS Rack Controller${!kp:+ (HWE)}" {
-	set gfxpayload=keep
-	linux	/install/${!kp}vmlinux $KERNEL_PARAMS modules=maas-rack-udeb initrd=/install/${!kp}initrd.gz quiet ---
-	initrd	/install/${!kp}initrd.gz
-}
-EOF
-    cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
 menuentry "Check disc for defects${!kp:+ (HWE)}" {
 	set gfxpayload=keep
 	linux	/install/${!kp}vmlinux $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---