From c52f1486d49a8661bb4d290639220f1bb6d50034 Mon Sep 17 00:00:00 2001
From: kszaq <kszaquitto@gmail.com>
Date: Sat, 17 Feb 2018 22:55:54 +0100
Subject: [PATCH] projects/Amlogic: remount $BOOT_ROOT only once and bring it
 back to ro after updating

---
 projects/Amlogic/bootloader/update.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
index b2a0d671c0..9207a34cdd 100755
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@@ -35,6 +35,8 @@ if [ -z "$BOOT_DISK" ]; then
   esac
 fi
 
+mount -o rw,remount $BOOT_ROOT
+
 for arg in $(cat /proc/cmdline); do
   case $arg in
     boot=*)
@@ -69,7 +71,6 @@ for arg in $(cat /proc/cmdline); do
             dd if="$UPDATE_DTB_SOURCE" of=/dev/dtb bs=256k status=none
             ;;
           /dev/mmc*|LABEL=*)
-            mount -o rw,remount $BOOT_ROOT
             cp -f "$UPDATE_DTB_SOURCE" "$BOOT_ROOT/dtb.img"
             ;;
         esac
@@ -80,7 +81,6 @@ for arg in $(cat /proc/cmdline); do
           dtb=$(basename $all_dtb)
           if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
             echo "Updating $dtb..."
-            mount -o rw,remount $BOOT_ROOT
             cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
           fi
         fi
@@ -102,14 +102,12 @@ for arg in $(cat /proc/cmdline); do
 done
 
 if [ -d $BOOT_ROOT/device_trees ]; then
-  mount -o rw,remount $BOOT_ROOT
   rm $BOOT_ROOT/device_trees/*.dtb
   cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT/device_trees/
 fi
 
 if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot.ini ]; then
   echo "Updating boot.ini..."
-  mount -o rw,remount $BOOT_ROOT
   cp -p $SYSTEM_ROOT/usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini
   if [ -f $SYSTEM_ROOT/usr/share/bootloader/config.ini ]; then
     if [ ! -f $BOOT_ROOT/config.ini ]; then
@@ -121,7 +119,6 @@ fi
 
 if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz ]; then
   echo "Updating boot logo..."
-  mount -o rw,remount $BOOT_ROOT
   cp -p $SYSTEM_ROOT/usr/share/bootloader/boot-logo.bmp.gz $BOOT_ROOT
 fi
 
@@ -130,3 +127,5 @@ if [ -f $SYSTEM_ROOT/usr/share/bootloader/u-boot -a ! -e /dev/system -a ! -e /de
   dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=1 count=112 status=none
   dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot of=$BOOT_DISK conv=fsync bs=512 skip=1 seek=1 status=none
 fi
+
+mount -o ro,remount $BOOT_ROOT