From 929506c8959e4afda82ac3fcee456092a1e04bec Mon Sep 17 00:00:00 2001 From: chewitt Date: Sun, 1 Dec 2019 05:10:37 +0000 Subject: [PATCH] busybox: fix search order in dtfile --- packages/sysutils/busybox/scripts/dtfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/scripts/dtfile b/packages/sysutils/busybox/scripts/dtfile index 96fa8a8f87..8fd21c64f8 100755 --- a/packages/sysutils/busybox/scripts/dtfile +++ b/packages/sysutils/busybox/scripts/dtfile @@ -8,10 +8,10 @@ COMPATIBLE=$(cat /proc/device-tree/compatible 2>/dev/null | tr -d '\000' | sed - if [ -n "$COMPATIBLE" ]; then if [ -e /flash/extlinux/extlinux.conf ]; then DTFILE=$(grep FDT /flash/extlinux/extlinux.conf | sed 's, *FDT /,,g') - elif [ -e /flash/boot.ini ]; then - DTFILE=$(grep -m 1 dtb_name /flash/boot.ini | cut -d \" -f2 | sed 's,/dtb/,,g') elif [ -e /flash/uEnv.ini ]; then DTFILE=$(grep dtb_name /flash/uEnv.ini | sed 's,dtb_name=/dtb/,,g') + elif [ -e /flash/boot.ini ]; then + DTFILE=$(grep -m 1 dtb_name /flash/boot.ini | cut -d \" -f2 | sed 's,/dtb/,,g') else DTFILE="" fi