|
 |
18971c |
From 17c1f640faf694e482cc657c9f40b5f61a23e301 Mon Sep 17 00:00:00 2001
|
|
|
18971c |
From: "Brian C. Lane" <bcl@redhat.com>
|
|
|
18971c |
Date: Thu, 21 Aug 2014 11:31:51 -0700
|
|
|
18971c |
Subject: [PATCH] Support spaces in mount_nfs (#1109933)
|
|
|
18971c |
|
|
|
18971c |
nfs paths may contain spaces, make sure they are preserved when passed
|
|
|
18971c |
to nfs_to_var and mount.
|
|
|
18971c |
|
|
|
18971c |
Related: rhbz#1109933
|
|
|
18971c |
(cherry picked from commit 7e692cfd43ac7f70dd58a0b083f33d6e80d3908c)
|
|
|
18971c |
---
|
|
|
18971c |
modules.d/95nfs/nfs-lib.sh | 4 ++--
|
|
|
18971c |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
18971c |
|
|
|
18971c |
diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
|
|
|
18971c |
index 9ced2e69..bf7d044b 100755
|
|
|
18971c |
--- a/modules.d/95nfs/nfs-lib.sh
|
|
|
18971c |
+++ b/modules.d/95nfs/nfs-lib.sh
|
|
|
18971c |
@@ -125,7 +125,7 @@ munge_nfs_options() {
|
|
|
18971c |
mount_nfs() {
|
|
|
18971c |
local nfsroot="$1" mntdir="$2" netif="$3"
|
|
|
18971c |
local nfs="" server="" path="" options=""
|
|
|
18971c |
- nfs_to_var $nfsroot $netif
|
|
|
18971c |
+ nfs_to_var "$nfsroot" $netif
|
|
|
18971c |
munge_nfs_options
|
|
|
18971c |
if [ "$nfs" = "nfs4" ]; then
|
|
|
18971c |
options=$options${nfslock:+,$nfslock}
|
|
|
18971c |
@@ -136,5 +136,5 @@ mount_nfs() {
|
|
|
18971c |
&& warn "Locks unsupported on NFSv{2,3}, using nolock" 1>&2
|
|
|
18971c |
options=$options,nolock
|
|
|
18971c |
fi
|
|
|
18971c |
- mount -t $nfs -o$options $server:$path $mntdir
|
|
|
18971c |
+ mount -t $nfs -o$options "$server:$path" "$mntdir"
|
|
|
18971c |
}
|