Merge lp:~cyphermox/debian-cd/ubuntu-server-live into lp:~ubuntu-cdimage/debian-cd/ubun3

[Mathieu Trudel-Lapierre]

Remove the "try without installing" option for ubuntu-server live images. In this case, we don't really have a "try without installing", and just want to be able to start to the installer directly.

[Steve Langasek (vorlon)]

Please reconcile this with <https://code.launchpad.net/~cyphermox/debian-cd/server-live/+merge/322131>, which wound up being applied to the zesty script but not the artful script.

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

Yes, the previous server-live merge was clearly the right way to do it... fixing.

[lp:~cyphermox/debian-cd/ubuntu-server-live]

1975. By Mathieu Trudel-Lapierre on 2017-10-05

Really fix not showing 'Try Ubuntu without installing' for server-live images.

[Steve Langasek (vorlon)]

LGTM now, thanks

review: Approve

=== modified file 'tools/boot/artful/boot-amd64'
--- tools/boot/artful/boot-amd64	2017-04-25 21:27:20 +0000
+++ tools/boot/artful/boot-amd64	2017-10-05 23:04:39 +0000
@@ -406,6 +406,9 @@
     if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
 	livelabel="^Start $HUMANPROJECT"
 	liveparams=' maybe-ubiquity'
+    elif [ "$PROJECT" = ubuntu-server ]; then
+	livelabel="^Install $HUMANPROJECT"
+	liveparams=' union=aufs'
     else
 	livelabel="^Try $HUMANPROJECT without installing"
 	liveparams=
@@ -430,7 +433,7 @@
 	initrd	$CASPER_INITRD
 }
 EOF
-    if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ]; then
+    if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
 	cat >> boot$N/isolinux/txt.cfg <<EOF
 label live-install
   menu label ^Install $HUMANPROJECT