aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--functions6
-rwxr-xr-xnetfs4
2 files changed, 5 insertions, 5 deletions
diff --git a/functions b/functions
index 2f10e01..5bfeb77 100644
--- a/functions
+++ b/functions
@@ -370,11 +370,11 @@ read_crypttab() {
# Filesystem functions
# These can be overridden/reused for customizations like shutdown/loop-fsck.
-NETFS="nonfs,nonfs4,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,noshfs,nofuse,nofuseblk,noglusterfs,nodavfs"
+NETFS="nfs,nfs4,smbfs,cifs,codafs,ncpfs,shfs,fuse,fuseblk,glusterfs,davfs,fuse.glusterfs"
# Check local filesystems
fsck_all() {
- fsck -A -T -C$FSCK_FD -a -t "$NETFS,noopts=_netdev" $FORCEFSCK
+ fsck -A -T -C$FSCK_FD -a -t "no${NETFS//,/,no},noopts=_netdev" $FORCEFSCK
return $?
}
@@ -414,7 +414,7 @@ fsck_reboot() {
}
mount_all() {
- mount -a -t "$NETFS" -O no_netdev
+ mount -a -t "nosysfs,no${NETFS//,/,no}" -O no_netdev
}
bootlogd_stop() {
diff --git a/netfs b/netfs
index ffda681..ea7e4eb 100755
--- a/netfs
+++ b/netfs
@@ -7,7 +7,7 @@
case "$1" in
start)
stat_busy "Mounting Network Filesystems"
- mount -a -t nfs,nfs4,smbfs,codafs,ncpfs,cifs,shfs,glusterfs,fuse,fuseblk,fuse.glusterfs,davfs
+ mount -a -t "$NETFS"
rc=$?
mount -a -O _netdev
(( rc || $? )) && stat_die
@@ -18,7 +18,7 @@ case "$1" in
stat_busy "Unmounting Network Filesystems"
umount -a -O _netdev
rc=$?
- umount -a -t nfs,nfs4,smbfs,codafs,ncpfs,cifs,shfs,glusterfs,fuse,fuseblk,fuse.glusterfs,davfs
+ umount -a -t "$NETFS"
(( rc || $? )) && stat_die
rm_daemon netfs
stat_done