aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-07-05 14:33:21 -0500
committerWilliam Hubbs <williamh@gentoo.org>2011-07-05 18:41:33 -0500
commite8e86b96dc8abbdfb7069a267873ef2950eb84cb (patch)
tree40e8e3cf073d57e2722b57a23cb152faead375c9
parent48dcc55b65c6e62d32b9c6a5ec69e67081e939ae (diff)
fix issue with extra_net_fs_list
The extra_net_fs_list variable was not being included as it should have been for the net file systems because it was being expanded before it was set by the user. X-Gentoo-Bug: 374133 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=374133
-rw-r--r--init.d/localmount.in4
-rw-r--r--init.d/mount-ro.in2
-rw-r--r--init.d/netmount.in6
-rw-r--r--sh/rc-functions.sh.in2
4 files changed, 7 insertions, 7 deletions
diff --git a/init.d/localmount.in b/init.d/localmount.in
index 734a7f84..efbddc79 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -16,7 +16,7 @@ start()
{
# Mount local filesystems in /etc/fstab.
local types="noproc" x= no_netdev=
- for x in $net_fs_list; do
+ for x in $net_fs_list $extra_net_fs_list; do
types="${types},${x}"
done
@@ -70,7 +70,7 @@ stop()
einfo "Unmounting filesystems"
eindent
local fs=
- for x in $net_fs_list; do
+ for x in $net_fs_list $extra_net_fs_list; do
fs="$fs${fs:+|}$x"
done
[ -n "$fs" ] && fs="^($fs)$"
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 4b89b044..dc2a098e 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -34,7 +34,7 @@ start()
fi
m="^($m)$"
fs=
- for x in $net_fs_list; do
+ for x in $net_fs_list $extra_net_fs_list; do
fs="$fs${fs:+|}$x"
done
[ -n "$fs" ] && fs="^($fs)$"
diff --git a/init.d/netmount.in b/init.d/netmount.in
index 4cc8842f..963ad26d 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -44,7 +44,7 @@ start()
[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
local x= fs= rc=
- for x in $net_fs_list; do
+ for x in $net_fs_list $extra_net_fs_list; do
case "$x" in
nfs|nfs4)
# If the nfsmount script took care of the nfs
@@ -81,7 +81,7 @@ stop()
ebegin "Unmounting network filesystems"
. "$RC_LIBEXECDIR"/sh/rc-mount.sh
- for x in $net_fs_list; do
+ for x in $net_fs_list $extra_net_fs_list; do
fs="$fs${fs:+,}$x"
done
if [ -n "$fs" ]; then
@@ -90,7 +90,7 @@ stop()
eindent
fs=
- for x in $net_fs_list; do
+ for x in $net_fs_list $extra_net_fs_list; do
fs="$fs${fs:+|}$x"
done
[ -n "$fs" ] && fs="^($fs)$"
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
index 02f84b47..50ba20b5 100644
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -39,7 +39,7 @@ stop_addon()
}
net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
-ncpfs nfs nfs4 ocfs2 shfs smbfs $extra_net_fs_list"
+ncpfs nfs nfs4 ocfs2 shfs smbfs"
is_net_fs()
{
[ -z "$1" ] && return 1