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

Proposed by Dimitri John Ledkov on 2020-02-18
Status: Merged
Merged at revision: 2043
Proposed branch: lp:~xnox/debian-cd/ubuntu-drop-maas
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
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 2020-02-18 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
1=== modified file 'tools/boot/focal/boot-amd64'
2--- tools/boot/focal/boot-amd64 2020-01-15 16:36:10 +0000
3+++ tools/boot/focal/boot-amd64 2020-02-18 17:48:16 +0000
4@@ -605,34 +605,6 @@
5 applies ${!kp}minimalvm=${!kp}install
6 EOF
7 done
8- # This really ought to be in gfxboot.cfg instead, but we want to
9- # make it particularly prominent.
10- cat >> boot$N/isolinux/txt.cfg <<EOF
11-label maas
12- menu label ^Install MAAS Region Controller
13- kernel /install/vmlinuz
14- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-region-udeb vga=788 initrd=/install/initrd.gz quiet ---
15-
16-label maasrack
17- menu label ^Install MAAS Rack Controller
18- kernel /install/vmlinuz
19- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-rack-udeb vga=788 initrd=/install/initrd.gz quiet ---
20-EOF
21- for kp in $KERNEL_PREFIXES; do
22- cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
23-menuentry "Install MAAS Region Controller" {
24- set gfxpayload=keep
25- linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-region-udeb vga=788 initrd=/install/${!kp}initrd.gz quiet ---
26- initrd /install/${!kp}initrd.gz
27-}
28-
29-menuentry "Install MAAS Rack Controller" {
30- set gfxpayload=keep
31- linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb vga=788 initrd=/install/${!kp}initrd.gz quiet ---
32- initrd /install/${!kp}initrd.gz
33-}
34-EOF
35- done
36 fi
37 fi
38 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
39
40=== modified file 'tools/boot/focal/boot-amd64+mac'
41--- tools/boot/focal/boot-amd64+mac 2019-10-18 23:26:51 +0000
42+++ tools/boot/focal/boot-amd64+mac 2020-02-18 17:48:16 +0000
43@@ -460,14 +460,6 @@
44 replace minimalvm=file=/cdrom/preseed/ubuntu-server-minimalvm.seed
45 applies minimalvm=install
46 EOF
47- # This really ought to be in gfxboot.cfg instead, but we want to
48- # make it particularly prominent.
49- cat >> boot$N/isolinux/txt.cfg <<EOF
50-label cloud
51- menu label ^Multiple server install with MAAS
52- kernel /install/vmlinuz
53- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
54-EOF
55 fi
56 fi
57 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
58
59=== modified file 'tools/boot/focal/boot-arm64'
60--- tools/boot/focal/boot-arm64 2019-10-18 23:26:51 +0000
61+++ tools/boot/focal/boot-arm64 2020-02-18 17:48:16 +0000
62@@ -247,25 +247,6 @@
63 EOF
64 done
65 fi
66-if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
67- if [ "$PROJECT" = ubuntu-server ]; then
68- for kp in $KERNEL_PREFIXES; do
69- cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
70-menuentry "Install MAAS Region Controller" {
71- set gfxpayload=keep
72- linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-region-udeb initrd=/install/${!kp}initrd.gz quiet ---
73- initrd /install/${!kp}initrd.gz
74-}
75-
76-menuentry "Install MAAS Rack Controller" {
77- set gfxpayload=keep
78- linux /install/${!kp}vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb initrd=/install/${!kp}initrd.gz quiet ---
79- initrd /install/${!kp}initrd.gz
80-}
81-EOF
82- done
83- fi
84-fi
85 if [ "$CDIMAGE_LIVE" = 1 ]; then
86 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
87 menuentry "Check disc for defects" {
88
89=== modified file 'tools/boot/focal/boot-i386'
90--- tools/boot/focal/boot-i386 2019-10-18 23:26:51 +0000
91+++ tools/boot/focal/boot-i386 2020-02-18 17:48:16 +0000
92@@ -504,14 +504,6 @@
93 applies ${!kp}minimalvm=${!kp}install
94 EOF
95 done
96- # This really ought to be in gfxboot.cfg instead, but we want to
97- # make it particularly prominent.
98- cat >> boot$N/isolinux/txt.cfg <<EOF
99-label cloud
100- menu label ^Multiple server install with MAAS
101- kernel /install/vmlinuz
102- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
103-EOF
104 fi
105 fi
106 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
107
108=== modified file 'tools/boot/focal/boot-ppc64el'
109--- tools/boot/focal/boot-ppc64el 2019-10-18 23:26:51 +0000
110+++ tools/boot/focal/boot-ppc64el 2020-02-18 17:48:16 +0000
111@@ -145,19 +145,6 @@
112
113 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
114 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
115-menuentry "Install MAAS Region Controller${!kp:+ (HWE)}" {
116- set gfxpayload=keep
117- linux /install/${!kp}vmlinux $KERNEL_PARAMS modules=maas-region-udeb initrd=/install/${!kp}initrd.gz quiet ---
118- initrd /install/${!kp}initrd.gz
119-}
120-
121-menuentry "Install MAAS Rack Controller${!kp:+ (HWE)}" {
122- set gfxpayload=keep
123- linux /install/${!kp}vmlinux $KERNEL_PARAMS modules=maas-rack-udeb initrd=/install/${!kp}initrd.gz quiet ---
124- initrd /install/${!kp}initrd.gz
125-}
126-EOF
127- cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
128 menuentry "Check disc for defects${!kp:+ (HWE)}" {
129 set gfxpayload=keep
130 linux /install/${!kp}vmlinux $KERNEL_PARAMS MENU=/bin/cdrom-checker-menu quiet ---

Subscribers

People subscribed via source and target branches