debian-cd

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

  1. ubuntu-drop-maas
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2043
Proposed branch: lp:~xnox/debian-cd/ubuntu-drop-maas
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 130 lines (+0/-76)
5 files modified
tools/boot/focal/boot-amd64 (+0/-28)
tools/boot/focal/boot-amd64+mac (+0/-8)
tools/boot/focal/boot-arm64 (+0/-19)
tools/boot/focal/boot-i386 (+0/-8)
tools/boot/focal/boot-ppc64el (+0/-13)
To merge this branch: bzr merge lp:~xnox/debian-cd/ubuntu-drop-maas
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+379404@code.launchpad.net

Commit message

Drop maas, it's now doing a deb2snap transition

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
605applies ${!kp}minimalvm=${!kp}install605applies ${!kp}minimalvm=${!kp}install
606EOF606EOF
607 done607 done
608 # This really ought to be in gfxboot.cfg instead, but we want to
609 # make it particularly prominent.
610 cat >> boot$N/isolinux/txt.cfg <<EOF
611label maas
612 menu label ^Install MAAS Region Controller
613 kernel /install/vmlinuz
614 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-region-udeb vga=788 initrd=/install/initrd.gz quiet ---
615
616label maasrack
617 menu label ^Install MAAS Rack Controller
618 kernel /install/vmlinuz
619 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-rack-udeb vga=788 initrd=/install/initrd.gz quiet ---
620EOF
621 for kp in $KERNEL_PREFIXES; do
622 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
623menuentry "Install MAAS Region Controller" {
624 set gfxpayload=keep
625 linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-region-udeb vga=788 initrd=/install/${!kp}initrd.gz quiet ---
626 initrd /install/${!kp}initrd.gz
627}
628
629menuentry "Install MAAS Rack Controller" {
630 set gfxpayload=keep
631 linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb vga=788 initrd=/install/${!kp}initrd.gz quiet ---
632 initrd /install/${!kp}initrd.gz
633}
634EOF
635 done
636 fi608 fi
637fi609fi
638if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then610if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
639611
=== 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 @@
460replace minimalvm=file=/cdrom/preseed/ubuntu-server-minimalvm.seed460replace minimalvm=file=/cdrom/preseed/ubuntu-server-minimalvm.seed
461applies minimalvm=install461applies minimalvm=install
462EOF462EOF
463 # This really ought to be in gfxboot.cfg instead, but we want to
464 # make it particularly prominent.
465 cat >> boot$N/isolinux/txt.cfg <<EOF
466label cloud
467 menu label ^Multiple server install with MAAS
468 kernel /install/vmlinuz
469 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
470EOF
471 fi463 fi
472fi464fi
473if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then465if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
474466
=== 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 @@
247EOF247EOF
248 done248 done
249fi249fi
250if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
251 if [ "$PROJECT" = ubuntu-server ]; then
252 for kp in $KERNEL_PREFIXES; do
253 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
254menuentry "Install MAAS Region Controller" {
255 set gfxpayload=keep
256 linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-region-udeb initrd=/install/${!kp}initrd.gz quiet ---
257 initrd /install/${!kp}initrd.gz
258}
259
260menuentry "Install MAAS Rack Controller" {
261 set gfxpayload=keep
262 linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb initrd=/install/${!kp}initrd.gz quiet ---
263 initrd /install/${!kp}initrd.gz
264}
265EOF
266 done
267 fi
268fi
269if [ "$CDIMAGE_LIVE" = 1 ]; then250if [ "$CDIMAGE_LIVE" = 1 ]; then
270 cat >> $CDDIR/boot/grub/grub.cfg <<EOF251 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
271menuentry "Check disc for defects" {252menuentry "Check disc for defects" {
272253
=== 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 @@
504applies ${!kp}minimalvm=${!kp}install504applies ${!kp}minimalvm=${!kp}install
505EOF505EOF
506 done506 done
507 # This really ought to be in gfxboot.cfg instead, but we want to
508 # make it particularly prominent.
509 cat >> boot$N/isolinux/txt.cfg <<EOF
510label cloud
511 menu label ^Multiple server install with MAAS
512 kernel /install/vmlinuz
513 append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
514EOF
515 fi507 fi
516fi508fi
517if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then509if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
518510
=== 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 @@
145145
146 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then146 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
147 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF147 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
148menuentry "Install MAAS Region Controller${!kp:+ (HWE)}" {
149 set gfxpayload=keep
150 linux /install/${!kp}vmlinux $KERNEL_PARAMS modules=maas-region-udeb initrd=/install/${!kp}initrd.gz quiet ---
151 initrd /install/${!kp}initrd.gz
152}
153
154menuentry "Install MAAS Rack Controller${!kp:+ (HWE)}" {
155 set gfxpayload=keep
156 linux /install/${!kp}vmlinux $KERNEL_PARAMS modules=maas-rack-udeb initrd=/install/${!kp}initrd.gz quiet ---
157 initrd /install/${!kp}initrd.gz
158}
159EOF
160 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
161menuentry "Check disc for defects${!kp:+ (HWE)}" {148menuentry "Check disc for defects${!kp:+ (HWE)}" {
162 set gfxpayload=keep149 set gfxpayload=keep
163 linux /install/${!kp}vmlinux $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---150 linux /install/${!kp}vmlinux $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---

Subscribers

People subscribed via source and target branches