[rhel7-branch 1/2] Fix passing ,nfsvers=3 to dracut (#1161820)

bcl installerbot-noreply at redhat.com
Fri Jun 12 21:17:07 UTC 2015


From: "Brian C. Lane" <bcl at redhat.com>

dracut cleans up the leading , but really we should pass it properly.
It now only adds the , if options already contains a value.

Resolves: rhbz#1161820
---
 dracut/anaconda-netroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh
index 0a9face..79d43c4 100755
--- a/dracut/anaconda-netroot.sh
+++ b/dracut/anaconda-netroot.sh
@@ -36,7 +36,7 @@ case $repo in
         # by defaulting to nfsvers=3 when no version is requested
         nfs_to_var "$repo" $netif
         if [ "$nfs" != "nfs4" ] && ! strstr "$options" "vers="; then
-            repo="nfs:$options,nfsvers=3:$server:$path"
+            repo="nfs:${options:+$options,}nfsvers=3:$server:$path"
         fi
         # END HACK. FIXME: Figure out what is up with nfs4, jeez
         if [ "${repo%.iso}" == "$repo" ]; then


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/94d0ea18d540bb9b375c938685f6557818cd7b75


More information about the anaconda-patches mailing list