lp://staging/~xnox/debian-cd/fix-boot-from-next-volume
- Get this branch:
- bzr branch lp://staging/~xnox/debian-cd/fix-boot-from-next-volume
Branch merges
- Steve Langasek: Needs Information
-
Diff: 25 lines (+2/-2)2 files modifiedtools/boot/hirsute/boot-amd64 (+1/-1)
tools/boot/hirsute/boot-arm64 (+1/-1)
Related source package recipes
Branch information
Recent revisions
- 2103. By Dimitri John Ledkov <xnox@xnox-Lenovo-YOGA-C630-13Q50>
-
efi: fix boot from next volume
grub2 has fixed `exit` cmd to take an argument. Now it is possible to
`exit 1`, which in EFI terms is unsuccesful boot attempt, which then
results in the next BootEntry from BootOrder to be attempted. - 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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/debian-cd
