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
=== 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 @@
419if [ "$CDIMAGE_LIVE" = 1 ]; then419if [ "$CDIMAGE_LIVE" = 1 ]; then
420 QUIET=quiet420 QUIET=quiet
421 SPLASH=splash421 SPLASH=splash
422 if [ "$PROJECT" = kubuntu ] || [ "$PROJECT" = kubuntu-plasma5 ]; then422 case "$PROJECT" in
423 livelabel="^Start $HUMANPROJECT"423 kubuntu|kubuntu-plasma5)
424 liveparams=' maybe-ubiquity'424 livelabel="^Start $HUMANPROJECT"
425 elif [ "$PROJECT" = ubuntu-server ]; then425 liveparams=' maybe-ubiquity'
426 livelabel="^Install $HUMANPROJECT"426 NOTRYONLYDO=true
427 liveparams=427 ;;
428 SPLASH=428 lubuntu)
429 else429 livelabel="^Start $HUMANPROJECT"
430 livelabel="^Try $HUMANPROJECT without installing"430 liveparams=
431 liveparams=431 NOTRYONLYDO=true
432 fi432 ;;
433 ubuntu-server)
434 livelabel="^Install $HUMANPROJECT"
435 liveparams=
436 SPLASH=
437 NOTRYONLYDO=true
438 ;;
439 ubuntu-mid)
440 livelabel="^Try $HUMANPROJECT without installing"
441 liveparams=
442 NOTRYONLYDO=true
443 ;;
444 *)
445 livelabel="^Try $HUMANPROJECT without installing"
446 liveparams=
447 esac
448
433 cat >> boot$N/isolinux/txt.cfg <<EOF449 cat >> boot$N/isolinux/txt.cfg <<EOF
434label live450label live
435 menu label $livelabel451 menu label $livelabel
@@ -450,7 +466,7 @@
450 initrd $CASPER_INITRD466 initrd $CASPER_INITRD
451}467}
452EOF468EOF
453 if [ "$PROJECT" != ubuntu-mid ] && [ "$PROJECT" != kubuntu ] && [ "$PROJECT" != kubuntu-plasma5 ] && [ "$PROJECT" != ubuntu-server ]; then469 if [ "$NOTRYONLYDO" != "true" ]; then
454 cat >> boot$N/isolinux/txt.cfg <<EOF470 cat >> boot$N/isolinux/txt.cfg <<EOF
455label live-install471label live-install
456 menu label ^Install $HUMANPROJECT472 menu label ^Install $HUMANPROJECT

Subscribers

People subscribed via source and target branches