From ec67d66b00205e4ccab72404425db989e78a475f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 24 May 2011 20:07:47 +0200
Subject: [PATCH] busybox-initramfs: check every supported filesystem before
 mounting

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../sysutils/busybox-initramfs/scripts/init   | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index e11f839414..68dc46cb15 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -95,13 +95,18 @@ REBOOT="0"
 
   mount_part() {
     progress "trying to mount $1 ..."
-    for i in 1 2 3 4 5 6 7 8 9 10; do
-      ERR_ENV=1
-      $IONICE /bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1
-      [ "$?" -eq "0" ] && ERR_ENV=0 && break
-      /bin/busybox usleep 1000000
-    done
-    [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
+
+      progress "check filesystem $1 ..."
+        /sbin/fsck -y $1 > /dev/null 2>&1
+
+      for i in 1 2 3 4 5 6 7 8 9 10; do
+        ERR_ENV=1
+        progress "mount filesystem $1 ..."
+        /bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1
+        [ "$?" -eq "0" ] && ERR_ENV=0 && break
+        /bin/busybox usleep 1000000
+      done
+      [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell
   }
 
   update() {
@@ -115,20 +120,6 @@ REBOOT="0"
     fi
   }
 
-  hfsdiskprep() {
-    for DEV in `/bin/busybox ls /dev/sd*`; do
-      FS_TYPE=$(/sbin/blkid -o value -s TYPE $DEV)
-      if [ "$FS_TYPE" = "hfs" -o "$FS_TYPE" = "hfsplus" ]; then
-        /sbin/fsck_hfs -r -y $DEV > /dev/null 2>&1
-      fi
-    done
-  }
-
-# deal with hfs partitions
-  if [ -x /sbin/fsck_hfs ]; then
-    hfsdiskprep
-  fi
-
   mount_part "$boot" "/flash" "ro,noatime"
 
   if [ -f "/flash/atv_single_boot" ]; then