From 52aa5db587f9aa12caae635cda65c900f46c2379 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 10 May 2018 07:21:03 +0100
Subject: [PATCH] init: extra update validation

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

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 8305e09095..760407b717 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -922,10 +922,17 @@
 
     sync
 
-    if [ ! -f "$UPDATE_DIR/$UPDATE_KERNEL" -o ! -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] ; then
-      echo "Missing ${UPDATE_KERNEL} or ${UPDATE_SYSTEM}!"
+    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 10s... " 10 "NOW"
+      StartProgress countdown "Normal startup in 30s... " 30 "NOW"
+      return 0
+    fi
+
+    if [ ! -f "$UPDATE_DIR/$UPDATE_KERNEL" -o ! -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] ; then
+      echo "Missing (source) ${UPDATE_KERNEL} or ${UPDATE_SYSTEM}!"
+      do_cleanup
+      StartProgress countdown "Normal startup in 30s... " 30 "NOW"
       return 0
     fi