lp:~xnox/debian-cd/hwe-focal

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-cdimage/debian-cd/ubuntu at revision 2110

Steve Langasek: Approve on 2021-01-30

Łukasz Zemczak: Needs Information on 2021-01-29

Diff: 284 lines (+85/-20)

5 files modified

CONF.sh (+1/-0)
tools/boot/focal/boot-amd64 (+32/-15)
tools/boot/focal/boot-arm64 (+32/-5)
tools/boot/focal/boot-ppc64el (+11/-0)
tools/boot/focal/boot-s390x (+9/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2110. By Dimitri John Ledkov on 2021-01-29

Enable hwe on subiquity isos attempt #2.

2109. By Łukasz Zemczak on 2021-01-29

Revert previous change as BACKPORT_KERNEL was only really used for when debian-installer was in use.

2108. By Łukasz Zemczak on 2021-01-28

focal: BACKPORT_KERNEL="hwe-20.04"

2107. By Steve Langasek on 2021-01-27

Merge lp:~xnox/debian-cd/focal-boot-next-fix

2106. By Łukasz Zemczak on 2021-01-21

focal: DEBVERSION=20.04.2

2105. By Steve Langasek on 2021-01-12

Restore the mkdir -p of the install/ directory, without which things fail later on

2104. By Iain Lane on 2021-01-08

merge lp:~xnox/debian-cd/unbreak-s390x

2103. By Steve Langasek on 2021-01-07

Merge lp:~xnox/debian-cd/fix-boot-from-next-volume

2102. By Łukasz Zemczak on 2020-12-15

Clean up all the things. Based on xnox's previous clean-up branch.

2101. By Iain Lane on 2020-12-01

common.sh: Use a proper "if" statement for ubuntu-canary in default_kernel_params()

In Bash (and POSIX shell), functions return the return code of the last
statement they executed if there's no other explicit return.

We have a function which ends with a statement like:

  [ $VAR = foo ] && do_something

When the first clause fails, the return code of this statement is 1. The
function returns 1 and, since we are running under set -e, the caller fails and
the script terminates.

Fix this by rewriting to use "if ... then ... fi" instead, which returns 0 if
the condition fails.

For information, note that there is a special case in the spec:

  The -e setting shall be ignored when executing [...] any command of an AND-OR
  list other than the last.

Which is why we terminate at the *caller* and not inside the function, and also
why this would work if we weren't inside a function. By being inside a
function, we effectively defeat this check.