diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
index 9bb3db4f..eb1e2a8f 100644
--- a/core-services/03-filesystems.sh
+++ b/core-services/03-filesystems.sh
@@ -2,6 +2,8 @@
 
 [ -n "$VIRTUALIZATION" ] && return 0
 
+remote_fs_opt="noafs,nosshfs,nonfs,nonfs4,nosmbfs,nocifs,nocoda,noncp,noncpfs,noocfs2,nogfs,nogfs2,noglusterfs,nopvfs2,noocfs2,nolustre,noceph"
+
 msg "Remounting rootfs read-only..."
 mount -o remount,ro / || emergency_shell
 
@@ -57,7 +59,7 @@ done
 
 if [ -z "$FASTBOOT" ]; then
     msg "Checking filesystems:"
-    fsck -A -T -a -t noopts=_netdev $FORCEFSCK
+    fsck -A -T -a -t "${remote_fs_opt},noopts=_netdev" $FORCEFSCK
     if [ $? -gt 1 ]; then
         emergency_shell
     fi
@@ -67,4 +69,4 @@ msg "Mounting rootfs read-write..."
 mount -o remount,rw / || emergency_shell
 
 msg "Mounting all non-network filesystems..."
-mount -a -t "nosysfs,nonfs,nonfs4,nosmbfs,nocifs" -O no_netdev || emergency_shell
+mount -a -t "${remote_fs_opt}" -O no_netdev || emergency_shell