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

Proposed by Simon Quigley on 2018-05-17
Status: Merged
Merged at revision: 1995
Proposed branch: lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 57 lines (+28/-12)
1 file modified
tools/boot/cosmic/boot-amd64 (+28/-12)
To merge this branch: bzr merge lp:~tsimonq2/debian-cd/lubuntu-cosmic-changes
Reviewer Review Type Date Requested Status
Steve Langasek Needs Fixing on 2018-07-12
Adam Conrad 2018-05-17 Needs Fixing on 2018-05-22
Review via email: mp+345792@code.launchpad.net

This proposal supersedes a proposal from 2018-05-17.

Description of the change

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".

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

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

review: Needs Fixing
1994. By Simon Quigley on 2018-05-18

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

Simon Quigley (tsimonq2) wrote :

.

Steve Langasek (vorlon) :
review: Needs Fixing
Simon Quigley (tsimonq2) :
1995. By Simon Quigley on 2018-05-21

Add kubuntu-plasma5 back.

Adam Conrad (adconrad) :
review: Needs Fixing
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) wrote :

requesting one minor fix again

review: Needs Fixing
1998. By Simon Quigley on 2018-07-12

Make ubuntu-mid work.

Simon Quigley (tsimonq2) wrote :

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!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/cosmic/boot-amd64'
2--- tools/boot/cosmic/boot-amd64 2018-05-02 21:44:19 +0000
3+++ tools/boot/cosmic/boot-amd64 2018-07-12 05:26:48 +0000
4@@ -419,17 +419,33 @@
5 if [ "$CDIMAGE_LIVE" = 1 ]; then
6 QUIET=quiet
7 SPLASH=splash
8- if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then
9- livelabel="^Start $HUMANPROJECT"
10- liveparams=' maybe-ubiquity'
11- elif [ "$PROJECT" = ubuntu-server ]; then
12- livelabel="^Install $HUMANPROJECT"
13- liveparams=
14- SPLASH=
15- else
16- livelabel="^Try $HUMANPROJECT without installing"
17- liveparams=
18- fi
19+ case "$PROJECT" in
20+ kubuntu|kubuntu-plasma5)
21+ livelabel="^Start $HUMANPROJECT"
22+ liveparams=' maybe-ubiquity'
23+ NOTRYONLYDO=true
24+ ;;
25+ lubuntu)
26+ livelabel="^Start $HUMANPROJECT"
27+ liveparams=
28+ NOTRYONLYDO=true
29+ ;;
30+ ubuntu-server)
31+ livelabel="^Install $HUMANPROJECT"
32+ liveparams=
33+ SPLASH=
34+ NOTRYONLYDO=true
35+ ;;
36+ ubuntu-mid)
37+ livelabel="^Try $HUMANPROJECT without installing"
38+ liveparams=
39+ NOTRYONLYDO=true
40+ ;;
41+ *)
42+ livelabel="^Try $HUMANPROJECT without installing"
43+ liveparams=
44+ esac
45+
46 cat >> boot$N/isolinux/txt.cfg <<EOF
47 label live
48 menu label $livelabel
49@@ -450,7 +466,7 @@
50 initrd $CASPER_INITRD
51 }
52 EOF
53- if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then
54+ if [ "$NOTRYONLYDO" != "true" ]; then
55 cat >> boot$N/isolinux/txt.cfg <<EOF
56 label live-install
57 menu label ^Install $HUMANPROJECT

Subscribers

People subscribed via source and target branches