mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
init: cleanup flash; execute real script not wrapper
This commit is contained in:
parent
9e79363e78
commit
438198dcd6
@ -554,6 +554,17 @@ mount_flash() {
|
|||||||
fi
|
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() {
|
mount_storage() {
|
||||||
progress "Mounting storage"
|
progress "Mounting storage"
|
||||||
|
|
||||||
@ -1078,6 +1089,7 @@ for BOOT_STEP in \
|
|||||||
set_consolefont \
|
set_consolefont \
|
||||||
check_disks \
|
check_disks \
|
||||||
mount_flash \
|
mount_flash \
|
||||||
|
cleanup_flash \
|
||||||
update_bootmenu \
|
update_bootmenu \
|
||||||
load_splash \
|
load_splash \
|
||||||
mount_storage \
|
mount_storage \
|
||||||
|
@ -29,7 +29,7 @@ if [ -f "${FLAG_FILE}" ]; then
|
|||||||
if [ "${MODE}" = "init" ]; then
|
if [ "${MODE}" = "init" ]; then
|
||||||
# Install new SPI bootloader files to /flash (if required)
|
# Install new SPI bootloader files to /flash (if required)
|
||||||
if [ "${BOOTLOADER}" = "yes" ]; then
|
if [ "${BOOTLOADER}" = "yes" ]; then
|
||||||
USE_FLASHROM=0 /usr/bin/rpi-eeprom-update -a
|
USE_FLASHROM=0 /usr/bin/.rpi-eeprom-update.real -a
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Bump process to next step
|
# Bump process to next step
|
||||||
@ -40,12 +40,9 @@ if [ -f "${FLAG_FILE}" ]; then
|
|||||||
sync
|
sync
|
||||||
|
|
||||||
if [ "${MODE}" = "update" ]; then
|
if [ "${MODE}" = "update" ]; then
|
||||||
# Cleanup SPI bootloader files and show current version
|
# Display current bootloader status
|
||||||
if [ "${BOOTLOADER}" = "yes" ]; then
|
if [ "${BOOTLOADER}" = "yes" ]; then
|
||||||
rm -f /flash/pieeprom.bin /flash/pieeprom.upd
|
USE_FLASHROM=0 /usr/bin/.rpi-eeprom-update.real
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Apply VIA USB3 update
|
# Apply VIA USB3 update
|
||||||
|
Loading…
x
Reference in New Issue
Block a user