From 6d696c7ac3a8887eb6101b311f14935770a84c1e Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 12 Jun 2018 12:28:27 +0100
Subject: [PATCH] init: strip leading / from BOOT_IMAGE & DISK_IMAGE,
 normalising for all projects

---
 packages/sysutils/busybox/scripts/init | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 13f7c20378..f8a19e3351 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -92,9 +92,11 @@
     case $arg in
       BOOT_IMAGE=*)
         IMAGE_KERNEL="${arg#*=}"
+        [ "${IMAGE_KERNEL:0:1}" = "/" ] && IMAGE_KERNEL="${IMAGE_KERNEL:1}"
         ;;
       SYSTEM_IMAGE=*)
         IMAGE_SYSTEM="${arg#*=}"
+        [ "${IMAGE_SYSTEM:0:1}" = "/" ] && IMAGE_SYSTEM="${IMAGE_SYSTEM:1}"
         ;;
       boot=*)
         boot="${arg#*=}"
@@ -922,7 +924,7 @@
 
     sync
 
-    if [ ! -b "$IMAGE_KERNEL" -a ! -f "/flash/$IMAGE_KERNEL" ] || [ ! -f "/flash/$IMAGE_SYSTEM" ]; then
+    if [ ! -b "/$IMAGE_KERNEL" -a ! -f "/flash/$IMAGE_KERNEL" ] || [ ! -f "/flash/$IMAGE_SYSTEM" ]; then
       echo "Missing (target) ${IMAGE_KERNEL} or ${IMAGE_SYSTEM}!"
       do_cleanup
       StartProgress countdown "Normal startup in 30s... " 30 "NOW"
@@ -991,7 +993,7 @@
     FLASH_FREE=$(( $FLASH_FREE * 1024 ))
 
     # Disregard kernel size if it's a a block device, which is the case on Amlogic/WeTek devices
-    if [ ! -b $IMAGE_KERNEL ]; then
+    if [ ! -b "/$IMAGE_KERNEL" ]; then
       OLD_KERNEL=$(stat -t "/flash/$IMAGE_KERNEL" | awk '{print $2}')
     else
       OLD_KERNEL="0"
@@ -1025,8 +1027,8 @@
     fi
 
     # all ok, update
-    if [ -b $IMAGE_KERNEL ]; then
-      update_partition "Kernel" "$UPDATE_KERNEL" "$IMAGE_KERNEL"
+    if [ -b "/$IMAGE_KERNEL" ]; then
+      update_partition "Kernel" "$UPDATE_KERNEL" "/$IMAGE_KERNEL"
     else
       update_file "Kernel" "$UPDATE_KERNEL" "/flash/$IMAGE_KERNEL"
     fi