summaryrefslogtreecommitdiffstats
path: root/pyanaconda/packaging
diff options
context:
space:
mode:
authorBrian C. Lane <bcl@redhat.com>2012-12-20 11:49:03 -0800
committerBrian C. Lane <bcl@redhat.com>2012-12-20 14:44:44 -0800
commit7a9096ba3f429d7792af440e984fa84fc70c2293 (patch)
tree64f58ccce93b1583ace19fad56fbbd278832867a /pyanaconda/packaging
parent7aba97384639f20d06baad5e56c73c6395b5ee00 (diff)
downloadanaconda-7a9096ba3f429d7792af440e984fa84fc70c2293.tar.gz
anaconda-7a9096ba3f429d7792af440e984fa84fc70c2293.tar.xz
anaconda-7a9096ba3f429d7792af440e984fa84fc70c2293.zip
fixup direct nfs iso url handling (#879187)
It was trying to mount the nfs path including the file.iso, so strip that off before passing it to _setupNFS.
Diffstat (limited to 'pyanaconda/packaging')
-rw-r--r--pyanaconda/packaging/yumpayload.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 5a6ee6163..98c105b5b 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -622,7 +622,11 @@ reposdir=%s
if needmount:
# Mount the NFS share on INSTALL_TREE. If it ends up
# being nfsiso we will move the mountpoint to ISO_DIR.
- self._setupNFS(INSTALL_TREE, method.server, method.dir,
+ if method.dir.endswith(".iso"):
+ nfsdir = os.path.dirname(method.dir)
+ else:
+ nfsdir = method.dir
+ self._setupNFS(INSTALL_TREE, method.server, nfsdir,
method.opts)
path = INSTALL_TREE