f71f619bc9
virt-manager-1.2.0.tar.bz2 virtinst-default-xen-to-qcow2-format.patch * OVMF/AAVMF Support (Laszlo Ersek, Giuseppe Scrivano, Cole Robinson) * Improved support for AArch64 qemu/kvm * virt-install: Support –disk type=network parameters * virt-install: Make –disk just work * virt-install: Add –disk sgio= option (Giuseppe Scrivano) * addhardware: default to an existing bus when adding a new disk (Giuseppe Scrivano) * virt-install: Add –input device option * virt-manager: Unify storagebrowser and storage details functionality * virt-manager: allow setting a custom connection row name * virt-install: Support –hostdev scsi passthrough * virt-install: Fill in a bunch of –graphics spice options * Disable spice image compression for new local VMs * virt-manager: big reworking of the migration dialog - Dropped tarball and patches virt-manager-1.1.0.tar.bz2 0b391fe9-Gtk-30.patch 20fe2873-check-for-empty-network-name.patch 24faf867-ignore-error-403-on-directories.patch 65f7017e-createnet-fix.patch activate-default-console.patch ce74cd77-connection-state-tick-updates-lock.patch virtinst-ppc64le.patch virtinst-supported-disk-formats.patch virtinst-support-suse-distros.patch virt-manager-1.1.0.tar.bz2 virtman-default-lxc-uri.patch virtman-stable-os-support.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=226
70 lines
2.8 KiB
Diff
70 lines
2.8 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.1.0/virtinst/util.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/util.py
|
|
+++ virt-manager-1.1.0/virtinst/util.py
|
|
@@ -557,3 +557,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.1.0/virtinst/distroinstaller.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/distroinstaller.py
|
|
+++ virt-manager-1.1.0/virtinst/distroinstaller.py
|
|
@@ -51,6 +51,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.1.0/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.1.0/virtinst/urlfetcher.py
|
|
@@ -33,6 +33,7 @@ import urlparse
|
|
import urlgrabber.grabber as grabber
|
|
|
|
from .osdict import OSDB
|
|
+from virtinst import util
|
|
|
|
|
|
#########################################################################
|
|
@@ -218,7 +219,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"
|