65 lines
2.5 KiB
Diff
65 lines
2.5 KiB
Diff
|
bnc#888251
|
||
|
|
|
||
|
|
Index: virt-manager-1.0.1/virtinst/util.py
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-1.0.1.orig/virtinst/util.py
|
||
|
|
+++ virt-manager-1.0.1/virtinst/util.py
|
||
|
|
@@ -626,3 +626,22 @@ def getInstallRepos(enabled_sources_only
|
||
|
|
zypper_output.insert(0, dom0_inst_source)
|
||
|
|
return (index_dom0, zypper_output)
|
||
|
|
|
||
|
|
+def sanitize_url(url):
|
||
|
|
+ """
|
||
|
|
+ Do nothing for http or ftp, but make sure nfs is in the expected format
|
||
|
|
+ """
|
||
|
|
+ if url.startswith("nfs://"):
|
||
|
|
+ # Convert RFC compliant NFS nfs://server/path/to/distro
|
||
|
|
+ # to what mount/anaconda expect nfs:server:/path/to/distro
|
||
|
|
+ # and carry the latter form around internally
|
||
|
|
+ url = "nfs:" + url[6:]
|
||
|
|
+
|
||
|
|
+ # If we need to add the : after the server
|
||
|
|
+ index = url.find("/", 4)
|
||
|
|
+ if index == -1:
|
||
|
|
+ raise ValueError(_("Invalid NFS format: No path specified."))
|
||
|
|
+ if url[index - 1] != ":":
|
||
|
|
+ url = url[:index] + ":" + url[index:]
|
||
|
|
+
|
||
|
|
+ return url
|
||
|
|
+
|
||
|
|
Index: virt-manager-1.0.1/virtinst/distroinstaller.py
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-1.0.1.orig/virtinst/distroinstaller.py
|
||
|
|
+++ virt-manager-1.0.1/virtinst/distroinstaller.py
|
||
|
|
@@ -50,6 +50,8 @@ def _sanitize_url(url):
|
||
|
|
"""
|
||
|
|
Do nothing for http or ftp, but make sure nfs is in the expected format
|
||
|
|
"""
|
||
|
|
+ # This sanitize will be done later
|
||
|
|
+ return url
|
||
|
|
if url.startswith("nfs://"):
|
||
|
|
# Convert RFC compliant NFS nfs://server/path/to/distro
|
||
|
|
# to what mount/anaconda expect nfs:server:/path/to/distro
|
||
|
|
Index: virt-manager-1.0.1/virtinst/urlfetcher.py
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-1.0.1.orig/virtinst/urlfetcher.py
|
||
|
|
+++ virt-manager-1.0.1/virtinst/urlfetcher.py
|
||
|
|
@@ -33,6 +33,7 @@ import urlparse
|
||
|
|
import urlgrabber.grabber as grabber
|
||
|
|
|
||
|
|
from virtinst import osdict
|
||
|
|
+from virtinst import util
|
||
|
|
|
||
|
|
|
||
|
|
#########################################################################
|
||
|
|
@@ -210,7 +211,8 @@ class _MountedImageFetcher(_LocalImageFe
|
||
|
|
|
||
|
|
logging.debug("Preparing mount at " + self.srcdir)
|
||
|
|
if self.location.startswith("nfs:"):
|
||
|
|
- cmd = [mountcmd, "-o", "ro", self.location[4:], self.srcdir]
|
||
|
|
+ url = util.sanitize_url(self.location)
|
||
|
|
+ cmd = [mountcmd, "-o", "ro", url[4:], self.srcdir]
|
||
|
|
else:
|
||
|
|
if stat.S_ISBLK(os.stat(self.location)[stat.ST_MODE]):
|
||
|
|
mountopt = "ro"
|