| 1 |
commit: e8e86b96dc8abbdfb7069a267873ef2950eb84cb |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 19:33:21 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 23:41:33 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e8e86b96 |
| 7 |
|
| 8 |
fix issue with extra_net_fs_list |
| 9 |
|
| 10 |
The extra_net_fs_list variable was not being included as it should have |
| 11 |
been for the net file systems because it was being expanded before it |
| 12 |
was set by the user. |
| 13 |
|
| 14 |
X-Gentoo-Bug: 374133 |
| 15 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=374133 |
| 16 |
|
| 17 |
--- |
| 18 |
init.d/localmount.in | 4 ++-- |
| 19 |
init.d/mount-ro.in | 2 +- |
| 20 |
init.d/netmount.in | 6 +++--- |
| 21 |
sh/rc-functions.sh.in | 2 +- |
| 22 |
4 files changed, 7 insertions(+), 7 deletions(-) |
| 23 |
|
| 24 |
diff --git a/init.d/localmount.in b/init.d/localmount.in |
| 25 |
index 734a7f8..efbddc7 100644 |
| 26 |
--- a/init.d/localmount.in |
| 27 |
+++ b/init.d/localmount.in |
| 28 |
@@ -16,7 +16,7 @@ start() |
| 29 |
{ |
| 30 |
# Mount local filesystems in /etc/fstab. |
| 31 |
local types="noproc" x= no_netdev= |
| 32 |
- for x in $net_fs_list; do |
| 33 |
+ for x in $net_fs_list $extra_net_fs_list; do |
| 34 |
types="${types},${x}" |
| 35 |
done |
| 36 |
|
| 37 |
@@ -70,7 +70,7 @@ stop() |
| 38 |
einfo "Unmounting filesystems" |
| 39 |
eindent |
| 40 |
local fs= |
| 41 |
- for x in $net_fs_list; do |
| 42 |
+ for x in $net_fs_list $extra_net_fs_list; do |
| 43 |
fs="$fs${fs:+|}$x" |
| 44 |
done |
| 45 |
[ -n "$fs" ] && fs="^($fs)$" |
| 46 |
|
| 47 |
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in |
| 48 |
index 4b89b04..dc2a098 100644 |
| 49 |
--- a/init.d/mount-ro.in |
| 50 |
+++ b/init.d/mount-ro.in |
| 51 |
@@ -34,7 +34,7 @@ start() |
| 52 |
fi |
| 53 |
m="^($m)$" |
| 54 |
fs= |
| 55 |
- for x in $net_fs_list; do |
| 56 |
+ for x in $net_fs_list $extra_net_fs_list; do |
| 57 |
fs="$fs${fs:+|}$x" |
| 58 |
done |
| 59 |
[ -n "$fs" ] && fs="^($fs)$" |
| 60 |
|
| 61 |
diff --git a/init.d/netmount.in b/init.d/netmount.in |
| 62 |
index 4cc8842..963ad26 100644 |
| 63 |
--- a/init.d/netmount.in |
| 64 |
+++ b/init.d/netmount.in |
| 65 |
@@ -44,7 +44,7 @@ start() |
| 66 |
[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind" |
| 67 |
|
| 68 |
local x= fs= rc= |
| 69 |
- for x in $net_fs_list; do |
| 70 |
+ for x in $net_fs_list $extra_net_fs_list; do |
| 71 |
case "$x" in |
| 72 |
nfs|nfs4) |
| 73 |
# If the nfsmount script took care of the nfs |
| 74 |
@@ -81,7 +81,7 @@ stop() |
| 75 |
ebegin "Unmounting network filesystems" |
| 76 |
. "$RC_LIBEXECDIR"/sh/rc-mount.sh |
| 77 |
|
| 78 |
- for x in $net_fs_list; do |
| 79 |
+ for x in $net_fs_list $extra_net_fs_list; do |
| 80 |
fs="$fs${fs:+,}$x" |
| 81 |
done |
| 82 |
if [ -n "$fs" ]; then |
| 83 |
@@ -90,7 +90,7 @@ stop() |
| 84 |
|
| 85 |
eindent |
| 86 |
fs= |
| 87 |
- for x in $net_fs_list; do |
| 88 |
+ for x in $net_fs_list $extra_net_fs_list; do |
| 89 |
fs="$fs${fs:+|}$x" |
| 90 |
done |
| 91 |
[ -n "$fs" ] && fs="^($fs)$" |
| 92 |
|
| 93 |
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in |
| 94 |
index 02f84b4..50ba20b 100644 |
| 95 |
--- a/sh/rc-functions.sh.in |
| 96 |
+++ b/sh/rc-functions.sh.in |
| 97 |
@@ -39,7 +39,7 @@ stop_addon() |
| 98 |
} |
| 99 |
|
| 100 |
net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre |
| 101 |
-ncpfs nfs nfs4 ocfs2 shfs smbfs $extra_net_fs_list" |
| 102 |
+ncpfs nfs nfs4 ocfs2 shfs smbfs" |
| 103 |
is_net_fs() |
| 104 |
{ |
| 105 |
[ -z "$1" ] && return 1 |
Archives