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

[Andres Rodriguez]

Add CD Options for Installing MAAS Region Controller and Rack Controller.

This branch adds the too options and replaces the old way of installing MAAS from the CD. This is dependent in the following branch been released in Ubuntu:
https://code.launchpad.net/~andreserl/maas/lp1561954/+merge/291259

[Mathieu Trudel-Lapierre (cyphermox)]

It looks reasonable, but why add the menu items in two passes at writing to txt.cfg or grub.cfg, if you can do it in just one?

You also can't use the 'cloud' label twice, that label will be used to start the right menu option if all you have is a command-line, so it can be useful on, for instance, powerpc.

Please fix the labels and make it all a write in one go ;)

review: Needs Fixing

[lp:~andreserl/debian-cd/maas]

1936. By Andres Rodriguez on 2016-04-07

Fix installer

[Mathieu Trudel-Lapierre (cyphermox)]

Looks great now.

review: Approve

=== modified file 'tools/boot/xenial/boot-amd64'
--- tools/boot/xenial/boot-amd64	2015-10-22 16:03:46 +0000
+++ tools/boot/xenial/boot-amd64	2016-04-07 21:18:09 +0000
@@ -527,15 +527,26 @@
         # 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 ---
+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
 	cat >> $CDDIR/boot/grub/grub.cfg <<EOF
-menuentry "Multiple server install with MAAS" {
-	set gfxpayload=keep
-	linux	/install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
+menuentry "Install MAAS Region Controller" {
+	set gfxpayload=keep
+	linux	/install/vmlinuz $KERNEL_PARAMS modules=maas-region-udeb vga=788 initrd=/install/initrd.gz quiet ---
+	initrd	/install/initrd.gz
+}
+
+menuentry "Install MAAS Rack Controller" {
+	set gfxpayload=keep
+	linux	/install/vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb vga=788 initrd=/install/initrd.gz quiet ---
 	initrd	/install/initrd.gz
 }
 EOF