aboutsummaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorKurt J. Bosch <kjb-temp-2009@alpenjodel.de>2011-07-05 23:35:07 +0200
committerTom Gundersen <teg@jklm.no>2011-07-10 21:54:37 +0200
commit98363ca955850c62064934265c56a7ca159b0035 (patch)
tree92b64110d65b2d578b5bff779676c1509abab55c /functions
parenta16cbaeda9ee38d581e8556cc31cc9aa10afb9d2 (diff)
downloadinitscripts-98363ca955850c62064934265c56a7ca159b0035.tar.xz
functions/netfs: Refactor filesystem type lists and $NETFS
Currently $NETFS is used only for fsck and mount in rc.sysinit. Since we moved it into functions, we can use it in netfs too to get rid of redundancy. functions: * Move 'nosysfs' from $NETFS into the mount -a type list because thats obviously the only meaningfull place. * Add 'nofuse.glusterfs' to $NETFS to match the lists in netfs. * Remove all 'no'-prefixes from $NETFS to make it more useful and readable. * Add 'no'-prefixes to fsck and mount -a commands by parameter substitution. netfs: * Instead of the literals use $NETFS from functions which contains the same types now
Diffstat (limited to 'functions')
-rw-r--r--functions6
1 files changed, 3 insertions, 3 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() {