lp://qastaging/~ubuntu-cdimage/debian-cd/rebased-cleanup
- Get this branch:
- bzr branch lp://qastaging/~ubuntu-cdimage/debian-cd/rebased-cleanup
Branch merges
- Ubuntu CD Image Team: Pending requested
-
Diff: 349 lines (+5/-251)4 files modifiedMakefile (+2/-59)
tools/boot/hirsute/boot-s390x (+3/-11)
tools/boot/hirsute/common.sh (+0/-146)
tools/hirsute/installtools.sh (+0/-35)
Branch information
Recent revisions
- 2102. By Łukasz Zemczak
-
Rebase xnox's lp:~xnox/debian-cd/cleanup branch on hirsute, as we already released groovy as-is.
- 2101. By Iain Lane
-
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. - 2093. By Steve Langasek
-
Restore the /boot/grub/
loopback. cfg file, used by Super GRUB Disk. LP: #1900185
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/debian-cd