From 5d01dc4f1dcf242e63028f6da12983939cb0f156 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 8 Sep 2019 17:56:25 +0100
Subject: [PATCH] init: cleanup flash; execute real script not wrapper

---
 packages/sysutils/busybox/scripts/init               | 12 ++++++++++++
 packages/sysutils/busybox/scripts/rpi-flash-firmware |  9 +++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 2b81d2a9a3..5c7a6c12d7 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -548,6 +548,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"
 
@@ -1072,6 +1083,7 @@ for BOOT_STEP in \
     set_consolefont \
     check_disks \
     mount_flash \
+    cleanup_flash \
     update_bootmenu \
     load_splash \
     mount_storage \
diff --git a/packages/sysutils/busybox/scripts/rpi-flash-firmware b/packages/sysutils/busybox/scripts/rpi-flash-firmware
index cb98427ba8..42f91098ae 100755
--- a/packages/sysutils/busybox/scripts/rpi-flash-firmware
+++ b/packages/sysutils/busybox/scripts/rpi-flash-firmware
@@ -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