Merge lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes into lp:~ubuntu-cdimage/debian-cd/ubuntu

[Simon Quigley]

On startup, Lubuntu wants to be the same as Kubuntu, in that "Try Lubuntu before installing" and "Install Lubuntu" are removed in favor of "Start Lubuntu".

[Steve Langasek (vorlon)]

Would you mind switching these terrible if || || || constructions into case statements as part of this?

review: Needs Fixing

[lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes]

1994. By Simon Quigley on 2018-05-18

Rework 419ish to use case rather than || || ||.

[Simon Quigley (tsimonq2)]

.

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes]

1995. By Simon Quigley on 2018-05-21

Add kubuntu-plasma5 back.

[Adam Conrad (adconrad)]

review: Needs Fixing

[lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes]

1996. By Simon Quigley on 2018-05-22

Some more adjustments from Adam's comments.

1997. By Simon Quigley on 2018-07-05

Make the code reflect the variable name.

[Steve Langasek (vorlon)]

requesting one minor fix again

review: Needs Fixing

[lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes]

1998. By Simon Quigley on 2018-07-12

Make ubuntu-mid work.

[Simon Quigley (tsimonq2)]

I did that, but made the ubuntu-mid case identical to the catch-all case with the exception of setting that env var.

Thanks Steve!

=== modified file 'tools/boot/cosmic/boot-amd64'
--- tools/boot/cosmic/boot-amd64	2018-05-02 21:44:19 +0000
+++ tools/boot/cosmic/boot-amd64	2018-07-12 05:26:48 +0000
@@ -419,17 +419,33 @@
 if [ "$CDIMAGE_LIVE" = 1 ]; then
     QUIET=quiet
     SPLASH=splash
-    if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
-	livelabel="^Start $HUMANPROJECT"
-	liveparams=' maybe-ubiquity'
-    elif [ "$PROJECT" = ubuntu-server ]; then
-	livelabel="^Install $HUMANPROJECT"
-	liveparams=
-	SPLASH=
-    else
-	livelabel="^Try $HUMANPROJECT without installing"
-	liveparams=
-    fi
+    case "$PROJECT" in
+        kubuntu|kubuntu-plasma5)
+            livelabel="^Start $HUMANPROJECT"
+            liveparams=' maybe-ubiquity'
+            NOTRYONLYDO=true
+            ;;
+        lubuntu)
+            livelabel="^Start $HUMANPROJECT"
+            liveparams=
+            NOTRYONLYDO=true
+            ;;
+        ubuntu-server)
+            livelabel="^Install $HUMANPROJECT"
+            liveparams=
+            SPLASH=
+            NOTRYONLYDO=true
+            ;;
+        ubuntu-mid)
+            livelabel="^Try $HUMANPROJECT without installing"
+            liveparams=
+            NOTRYONLYDO=true
+            ;;
+        *)
+            livelabel="^Try $HUMANPROJECT without installing"
+            liveparams=
+    esac
+
     cat >> boot$N/isolinux/txt.cfg <<EOF
 label live
   menu label $livelabel
@@ -450,7 +466,7 @@
 	initrd	$CASPER_INITRD
 }
 EOF
-    if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
+    if [ "$NOTRYONLYDO" != "true" ]; then
 	cat >> boot$N/isolinux/txt.cfg <<EOF
 label live-install
   menu label ^Install $HUMANPROJECT