From 9171a0678d9ef7b5918280ccf5dee8ae9be078e4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 7 Jun 2014 17:10:42 +0200
Subject: [PATCH] busybox: unmount /flash and /storage on reboot in initramfs,
 add 'do_reboot' function and use this for all reboot calls

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/busybox/scripts/init | 37 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index 6cf2017104..7b7fe4f5d7 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -43,7 +43,6 @@
   IMAGE_SYSTEM="SYSTEM"
 
   BOOT_STEP="start"
-  REBOOT="0"
   MD5_FAILED="0"
   MD5_NOCHECK="0"
   SIZE_FAILED="0"
@@ -398,6 +397,25 @@
     fi
   }
 
+  do_reboot() {
+    echo "System reboots now..."
+
+    # syncing filesystem
+      sync
+
+    # unmount filesystems
+      if /bin/busybox mountpoint -q /flash ; then
+         /bin/busybox umount /flash
+      fi
+
+      if /bin/busybox mountpoint -q /storage ; then
+        /bin/busybox umount /storage
+      fi
+
+    usleep 2000000
+    /bin/busybox reboot
+  }
+
   check_disks() {
     if [ "$RUN_FSCK" = "yes" -a -n "$RUN_FSCK_DISKS" ]; then
       progress "Checking disk(s): $RUN_FSCK_DISKS"
@@ -413,14 +431,11 @@
             ;;
           2) # reboot needed
             echo "filesystem repaired, reboot needed..."
-            sleep 5
-            sync
-            reboot
+            do_reboot
             ;;
           4) # errors left
-            error "could not repair filesystem, dropping to debug shell, try to run 'fsck' manually, exit with 'exit'"
-            sync
-            reboot
+            error "could not repair filesystem, dropping to debug shell, try to run 'fsck' manually"
+            do_reboot
             ;;
         esac
     fi
@@ -571,7 +586,7 @@
           update "Kernel" "$UPDATE_KERNEL" "/flash/$IMAGE_KERNEL"
           update "System" "$UPDATE_SYSTEM" "/flash/$IMAGE_SYSTEM"
           update_bootloader
-          REBOOT="1"
+          do_reboot
         else
           rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null
           echo "md5 check failed. normal startup in 30s..."
@@ -586,12 +601,6 @@
         usleep 30000000
       fi
     fi
-
-    if test "$REBOOT" -eq "1"; then
-      echo "System reboots now..."
-      usleep 2000000
-      reboot
-    fi
   }
 
   prepare_sysroot() {