diff options
author | Leah Rowe <leah@libreboot.org> | 2023-08-24 20:19:41 +0100 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2023-08-26 16:58:32 +0100 |
commit | 1c8401be25e4749a2eee5ddc77ce7c6ac880c910 (patch) | |
tree | 22789efec9b91ffddb21653a30b8591a8b63d3bf /resources/scripts/build/grub/payload | |
parent | 50c395df59564c19d3a24262810c8dd5ed115db5 (diff) |
much, much stricter, more verbose error handling
lbmk is much more likely to crash now, in error conditions,
which is a boon for further auditing.
also: in "fetch", remove the downloaded program
if fail() was called.
this would also be done for gnulib, when downloading
grub, but done in such a way that gnulib goes first.
where calls to err write "ERROR" in the string, they
no longer say "ERROR" because the "err" function itself
now does that automatically.
also: listmodes/listoptions (in "lbmk") now reports an
error if no scripts and/or directories are found.
also: where a warning is given, but not an error, i've
gone through in some places and redirected the output
to stderr, not stdout
as part of error checks: running anything as root, except
for the "./build dependencies *" commands, is no longer
permitted and lbmk will throw an error
mrc downloads: debugfs output no longer redirected to /dev/null,
and stderr no longer redirected to stdout. everything is verbose.
certain non-error states are also more verbose. for example,
patch_rom in blobs/inject will now state when injection succeeds
certain actual errors(bugs) were fixed:
for example, build/release/roms now correctly prepares the blobs
hash files for a given target, containing only the files and
checksums in the list. Previously, a printf message was included.
Now, with this new code: blobutil/inject rightly verifies hashes.
doing all of this in one giant patch is cleaner
than 100 patches changing each file. even this is yet part
of a much larger audit going on in the Libreboot project.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'resources/scripts/build/grub/payload')
-rwxr-xr-x | resources/scripts/build/grub/payload | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/resources/scripts/build/grub/payload b/resources/scripts/build/grub/payload index 7f1d239f..00ed4d44 100755 --- a/resources/scripts/build/grub/payload +++ b/resources/scripts/build/grub/payload @@ -46,13 +46,16 @@ main() handle_dependencies() { [ -d "grub/" ] || \ - ./fetch grub || err "cannot fetch grub" + ./fetch grub || \ + err "handle_dependencies: cannot fetch grub" [ -f "grub/grub-mkstandalone" ] || \ - ./build grub utils || err "cannot build grub utils" + ./build grub utils || \ + err "handle_dependencies: cannot build grub utils" [ -d "elf/grub" ] || \ - mkdir -p elf/grub || err "cannot create directory, elf/grub" - - rm -f elf/grub/* || err "cannot delete files in directory, elf/grub/" + mkdir -p elf/grub || \ + err "handle_dependencies: cannot mkdir elf/grub" + rm -f elf/grub/* || \ + err "handle_dependencies: cannot rm inside: elf/grub/" } build_grub_payloads() @@ -85,15 +88,17 @@ build_grub_elf() --modules="${grub_modules}" \ --install-modules="${grub_install_modules}" \ ${gcfg} ${grubk} || \ - err "cannot create grub payload (grub-mkstandalone)" + err "build_grub_elf: cannot build grub payload (grub-mkstandalone)" } create_grub_config() { sed "s/usqwerty/${keymap}/" < ${grubcfgsdir}/config/grub.cfg \ - > elf/grub/grub_${keymap}.cfg || err "sed failed: grub.cfg" + > elf/grub/grub_${keymap}.cfg || \ + err "create_grub_config: sed failed: grub.cfg" sed "s/grubtest.cfg/grub.cfg/" < elf/grub/grub_${keymap}.cfg \ - > elf/grub/grub_${keymap}_test.cfg || err "sed failed: grubtest.cfg" + > elf/grub/grub_${keymap}_test.cfg || \ + err "create_grub_config: sed failed: grubtest.cfg" } main $@ |