diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-08-23 03:59:35 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-08-23 03:59:35 +0100 |
| commit | 7e6f52ec0a7a4106378191d352a862c0a03e71c4 (patch) | |
| tree | 5be05f8efd74fdd0f1a6d40f6ad8b25b3cebb8fd | |
| parent | 616ef52a6f892a9a9021f90bbd0f48fad5253f71 (diff) | |
vendor.sh: use pad/unpad functions
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/vendor.sh | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index 55373913..da23b145 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -292,25 +292,16 @@ prep() [ -z "${_xromname#"$vfix"}" ] && err "$_xromname / $vfix: name match" # Remove the prefix and 1-byte pad - if [ "$nuke" != "nuke" ] && \ - [ "${_xromname#"$vfix"}" != "$_xromname" ]; then - xromsize="$(expr $(stat -c '%s' "$_xrom") - 1)" || err "!int" - [ $xromsize -lt 524288 ] && err "too small, $xromsize: $_xrom" - - x_ dd if="$_xrom" of="$_xromnew" bs=$xromsize count=1 - x_ rm -f "$_xrom" - - _xrom="$_xromnew" - fi + [ "$nuke" != "nuke" ] && [ "${_xromname#"$vfix"}" != "$_xromname" ] \ + && unpad_one_byte "$_xrom" && x_ mv "$_xrom" "$_xromnew" \ + && _xrom="$_xromnew" [ "$nuke" != "nuke" ] || ( mksha512 "$_xrom" "vendorhashes" ) || err add_vfiles "$_xrom" || return 1 # if break return, can still change MAC - [ "$nuke" != "nuke" ] && return 0 - # Rename the file, prefixing a warning saying not to flash - cat "$_xrom" config/data/coreboot/0 > "$_xromnew" || err "!pad $_xrom" - x_ rm -f "$_xrom" + [ "$nuke" = "nuke" ] && pad_one_byte "$_xrom" && x_ mv "$_xrom" \ + "$_xromnew"; : } mksha512() |