ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

flash.sh: replace die calls by recovery calls where relevant otherwise returning to caller without being useful

Browse Source 
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion 2024-09-01 18:44:52 -04:00
parent b9495130cf
commit 9fcba64ffe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
initrd/bin/flash.sh
View File

@ -26,13 +26,13 @@ flash_rom() {
ROM=$1 ROM=$1
if [ "$READ" -eq 1 ]; then if [ "$READ" -eq 1 ]; then
$CONFIG_FLASH_OPTIONS -r "${ROM}" \ $CONFIG_FLASH_OPTIONS -r "${ROM}" \
|| die "Backup to $ROM failed" || recovery "Backup to $ROM failed"
else else
cp "$ROM" /tmp/${CONFIG_BOARD}.rom cp "$ROM" /tmp/${CONFIG_BOARD}.rom
sha256sum /tmp/${CONFIG_BOARD}.rom sha256sum /tmp/${CONFIG_BOARD}.rom
if [ "$CLEAN" -eq 0 ]; then if [ "$CLEAN" -eq 0 ]; then
preserve_rom /tmp/${CONFIG_BOARD}.rom \ preserve_rom /tmp/${CONFIG_BOARD}.rom \
|| die "$ROM: Config preservation failed" || recovery "$ROM: Config preservation failed"
fi fi
# persist serial number from CBFS # persist serial number from CBFS
if cbfs.sh -r serial_number > /tmp/serial 2>/dev/null; then if cbfs.sh -r serial_number > /tmp/serial 2>/dev/null; then
@ -86,7 +86,7 @@ if [ "$READ" -eq 0 ] && [ "${ROM##*.}" = tgz ]; then
echo "Reading current flash and building an update image" echo "Reading current flash and building an update image"
$CONFIG_FLASH_OPTIONS -r /tmp/flash.sh.bak \ $CONFIG_FLASH_OPTIONS -r /tmp/flash.sh.bak \
|| die "Read of flash has failed" || recovery "Read of flash has failed"
# ROM and bootblock already have ECC # ROM and bootblock already have ECC
bootblock=$(echo /tmp/verified_rom/*.bootblock) bootblock=$(echo /tmp/verified_rom/*.bootblock)