6bbd8f8c21
virt-manager-1.3.0.tar.bz2 * Git hosting moved to http://github.com/virt-manager/virt-manager * Switch translation infrastructure from transifex to fedora.zanata.org * Add dogtail UI tests and infrastructure * Improved support for s390x kvm (Kevin Zhao) * virt-install and virt-manager now remove created disk images if VM install startup fails * Replace urlgrabber usage with requests and urllib2 * virt-install: add –network virtualport support for openvswitch (Daniel P. Berrange) * virt-install: support multiple –security labels * virt-install: support –features kvm_hidden=on|off (Pavel Hrdina) * virt-install: add –features pmu=on|off * virt-install: add –features pvspinlock=on|off (Abhijeet Kasurde) * virt-install: add –events on_lockfailure=on|off (Abhijeet Kasurde) * virt-install: add –network link_state=up|down * virt-install: add –vcpu placement=static|auto - Dropped virt-manager-1.2.1.tar.bz2 34db1af7-fix-adding-iscsi-pools.patch 360fe110-add-s390x-arch-support.patch 4970615f-fix-qemu-vs-lxc-detection.patch 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch 601a82cb-fix-console_type-if-xen.patch 76bad650-fix-virt-xml-define-and-update.patch 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch 8dbe96fc-add-s390x-arch-support.patch a9b303fb-fix-copy-host-cpu-definition.patch aebebbf8-report-an-error-for-pxe-install-without-network.patch cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=283
70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
Reference: bnc#888251
|
|
A fix for accessing nfs mounted media. A comment in the code states,
|
|
"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"
|
|
We need the RFC version to work correctly whereas redhat's anaconda
|
|
needs their own modified version.
|
|
Index: virt-manager-1.3.0/virtinst/util.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtinst/util.py
|
|
+++ virt-manager-1.3.0/virtinst/util.py
|
|
@@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only
|
|
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.3.0/virtinst/distroinstaller.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtinst/distroinstaller.py
|
|
+++ virt-manager-1.3.0/virtinst/distroinstaller.py
|
|
@@ -49,6 +49,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.3.0/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.3.0/virtinst/urlfetcher.py
|
|
@@ -33,6 +33,7 @@ import urllib2
|
|
import urlparse
|
|
|
|
from .osdict import OSDB
|
|
+from virtinst import util
|
|
|
|
|
|
#########################################################################
|
|
@@ -295,7 +296,8 @@ class _MountedURLFetcher(_LocalURLFetche
|
|
|
|
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"
|