From 695d78e4aac7a0e87d1511b14137d66a509f6881 Mon Sep 17 00:00:00 2001 From: kszaq Date: Tue, 13 Feb 2018 22:31:58 +0100 Subject: [PATCH] projects/Amlogic: fix update script when no *.dtb in /flash If there is no file matching /flash/*.dtb wildcard, the loop will proceed with all_dtb="/flash/*.dtb", causing erratic behaviour in next script steps. Fix this by checking if exists before proceeding. --- projects/Amlogic/bootloader/update.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh index 4c0e5afed4..97e1573fcb 100755 --- a/projects/Amlogic/bootloader/update.sh +++ b/projects/Amlogic/bootloader/update.sh @@ -75,12 +75,14 @@ for arg in $(cat /proc/cmdline); do esac fi - for all_dtb in /flash/*.dtb /flash/DTB; do - dtb=$(basename $all_dtb) - if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then - echo "*** updating Device Tree Blob: $dtb ..." - mount -o rw,remount $BOOT_ROOT - cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT + for all_dtb in /flash/*.dtb ; do + if [ -f $all_dtb ] ; then + dtb=$(basename $all_dtb) + if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then + echo "*** updating Device Tree Blob: $dtb ..." + mount -o rw,remount $BOOT_ROOT + cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT + fi fi done ;;