2 files changed, 22 insertions, 20 deletions
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index cfa7d5689..29d72168c 100644
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -8,4 +8,26 @@
 # activate any logical volumes
 [ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
 
+fstypes="ext2 ext3 ext4 xfs vfat ntfs"
+
+# filesystem checks
+for fs in $fstypes; do
+       [ -x /usr/sbin/fsck.$fs ] && {
+               for i in $(grep -v "^#" /etc/fstab|grep $fs|awk '{ print $1}');do 
+                       echo "Checking filesystem on $i with $fs"
+                       fsck -p -t $fs $i
+               done
+       }
+done
+
+# mount local filesystems
+for fs in $fstypes; do
+       grep $fs /proc/filesystems >/dev/null 2>&1
+       if [ $? -eq 0 ];then
+               grep -v "^#" /etc/fstab |grep $fs >/dev/null 2>&1
+               if [ $? -eq 0 ];then
+                       mount -a -t $fs
+               fi
+       fi
+done
 exit 0
diff --git a/package/base-files/src/etc/init.d/fsnet b/package/base-files/src/etc/init.d/fsnet
deleted file mode 100644
index 75ae760e0..000000000
--- a/package/base-files/src/etc/init.d/fsnet
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#INIT 60
-[[ $1 = autostart ]] || exit 0
-
-# mount net filesystems (nfs/cifs)
-grep nfs /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t nfs
-	fi
-fi
-grep cifs /proc/filesystems  >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1
-	if [ $? -eq 0 ];then
-		mount -a -t cifs
-	fi
-fi
-exit 0