From 19691ff47a371e6608be2bc660c47a849061e72a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 23 Sep 2013 21:56:54 +0300
Subject: [PATCH 1/2] init: disable autoupdate on netboot

TODO: rework settings addon to disable update
settings / not run update thread

closes #1653, closes #2291
---
 .../sysutils/busybox-initramfs/scripts/init       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index c1dd1036d4..2137fe0da1 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -285,15 +285,19 @@
         ;;
       CIFS=*|SMB=*)
         MOUNT_CMD="mount_cifs"
+        UPDATE_DISABLED=yes
         ;;
       ISCSI=*)
         MOUNT_CMD="mount_iscsi"
+        UPDATE_DISABLED=yes
         ;;
       NBD=*)
         MOUNT_CMD="mount_nbd"
+        UPDATE_DISABLED=yes
         ;;
       NFS=*)
         MOUNT_CMD="mount_nfs"
+        UPDATE_DISABLED=yes
         ;;
       FILE=*)
         MOUNT_CMD="mount_common"
@@ -456,6 +460,13 @@
       fi
 
     if [ -f "$UPDATE_DIR/$UPDATE_KERNEL" -a -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] ; then
+      if [ "$UPDATE_DISABLED" = "yes" ] ; then
+        rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null
+        echo "Updating not supported on netboot. normal startup in 10s..."
+        sync
+        usleep 10000000
+        return 0
+      fi
       if [ -f "$UPDATE_DIR/.nocheck" ] ; then
         MD5_NOCHECK="1"
       fi
@@ -568,6 +579,10 @@
   /bin/busybox mount --move /proc /sysroot/proc
   /bin/busybox mount --move /sys /sysroot/sys
 
+# tell OE settings addon to disable updates
+  if [ "$UPDATE_DISABLED" = "yes" ] ; then
+    echo "" > /sysroot/dev/.update_disabled
+  fi
 # switch to new sysroot and start real init
   exec /bin/busybox switch_root /sysroot /lib/systemd/systemd $INIT_ARGS
 

From b0b995abd6f28f4b34bfad5605491333f94400cb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 23 Sep 2013 22:46:08 +0300
Subject: [PATCH 2/2] init: allow update if boot= is local

ups.. thanks @MilhouseVH

ref #1653
---
 .../initramfs/sysutils/busybox-initramfs/scripts/init    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index 2137fe0da1..b8835e6f20 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -72,6 +72,11 @@
         ;;
       boot=*)
         boot="${arg#*=}"
+        case $boot in
+          CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*)
+            UPDATE_DISABLED=yes
+            ;;
+        esac
         ;;
       disk=*)
         disk="${arg#*=}"
@@ -285,19 +290,15 @@
         ;;
       CIFS=*|SMB=*)
         MOUNT_CMD="mount_cifs"
-        UPDATE_DISABLED=yes
         ;;
       ISCSI=*)
         MOUNT_CMD="mount_iscsi"
-        UPDATE_DISABLED=yes
         ;;
       NBD=*)
         MOUNT_CMD="mount_nbd"
-        UPDATE_DISABLED=yes
         ;;
       NFS=*)
         MOUNT_CMD="mount_nfs"
-        UPDATE_DISABLED=yes
         ;;
       FILE=*)
         MOUNT_CMD="mount_common"