init: cleanup flash; execute real script not wrapper

This commit is contained in:
MilhouseVH 2019-09-08 17:56:25 +01:00
parent 9e79363e78
commit 438198dcd6
2 changed files with 15 additions and 6 deletions

View File

@ -554,6 +554,17 @@ mount_flash() {
fi
}
cleanup_flash() {
progress "Cleaning up flash (if required)"
if [ -f /flash/pieeprom.upd ]; then
mount -o remount,rw /flash
rm -f /flash/pieeprom.bin /flash/pieeprom.upd
rm -f /flash/recovery.bin /flash/recovery.[0-9][0-9][0-9] /flash/RECOVERY.[0-9][0-9][0-9]
mount -o remount,ro /flash
fi
}
mount_storage() {
progress "Mounting storage"
@ -1078,6 +1089,7 @@ for BOOT_STEP in \
set_consolefont \
check_disks \
mount_flash \
cleanup_flash \
update_bootmenu \
load_splash \
mount_storage \

View File

@ -29,7 +29,7 @@ if [ -f "${FLAG_FILE}" ]; then
if [ "${MODE}" = "init" ]; then
# Install new SPI bootloader files to /flash (if required)
if [ "${BOOTLOADER}" = "yes" ]; then
USE_FLASHROM=0 /usr/bin/rpi-eeprom-update -a
USE_FLASHROM=0 /usr/bin/.rpi-eeprom-update.real -a
fi
# Bump process to next step
@ -40,12 +40,9 @@ if [ -f "${FLAG_FILE}" ]; then
sync
if [ "${MODE}" = "update" ]; then
# Cleanup SPI bootloader files and show current version
# Display current bootloader status
if [ "${BOOTLOADER}" = "yes" ]; then
rm -f /flash/pieeprom.bin /flash/pieeprom.upd
rm -f /flash/recovery.bin /flash/recovery.[0-9][0-9][0-9] /flash/RECOVERY.[0-9][0-9][0-9]
# Display current bootloader status
USE_FLASHROM=0 /usr/bin/rpi-eeprom-update
USE_FLASHROM=0 /usr/bin/.rpi-eeprom-update.real
fi
# Apply VIA USB3 update