lp:~ubuntu-cdimage/debian-cd/rebased-cleanup

Branch merges

Propose for merging

No branches dependent on this one.

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

Ubuntu CD Image Team: Pending requested 2020-12-11

Diff: 349 lines (+5/-251)

4 files modified

Makefile (+2/-59)
tools/boot/hirsute/boot-s390x (+3/-11)
tools/boot/hirsute/common.sh (+0/-146)
tools/hirsute/installtools.sh (+0/-35)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

Rebase xnox's lp:~xnox/debian-cd/cleanup branch on hirsute, as we already released groovy as-is.

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.

2100. By Łukasz Zemczak on 2020-11-25

Correctly set the layerfs kernel option for the canary image

2099. By Iain Lane on 2020-11-03

CONF.sh: Use distro's xorriso for hirsute

2098. By Łukasz Zemczak on 2020-10-28

HANIMAL -> Hippo

2097. By Łukasz Zemczak on 2020-10-23

Copy groovy -> hirsute, and add hirsute to CONF.sh

2096. By Iain Lane on 2020-10-22

Make sure we match the memtest deb we just downloaded

2095. By Iain Lane on 2020-10-22

Merge lp:~vorlon/debian-cd/lp.1899615 to restore memtest on bios boots

2094. By Iain Lane on 2020-10-19

groovy: Beta -> Release

2093. By Steve Langasek on 2020-10-16

Restore the /boot/grub/loopback.cfg file, used by Super GRUB Disk.

LP: #1900185