78a6564ed4
virt-manager-1.2.1.tar.bz2 * Bugfix release * Fix connecting to older libvirt versions (Michał Kępień) * Fix connecting to VM console with non-IP hostname (Giuseppe Scrivano) * Fix addhardware/create wizard errors when a nodedev disappears * Fix adding a second cdrom via customize dialog - Dropped tarball and patches virt-manager-1.2.0.tar.bz2 848123e6-fix-memory-stats-for-shutoff-VM.patch ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch c4d26d16-fix-VM-polling-on-old-libvirt.patch ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch 88e18c86-fix-sending-net-removed-signal.patch fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch 2c1e482b-fix--show-host-summary-error-windows-flooding.patch 4b5c836a-read-start-mode-from-inactive-conf-XML.patch 776c1d97-fix-changing-USB-device-model.patch bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch f8af2e6b-verify-HYPER-V-support-after-customization.patch 9ea3fcd1-add-classes-for-SUSE-distros.patch 23f262ec-fetch-URL-media-from-content-file-for-suse-distros.patch 5618fa4c-add-support-for-detecting-os-variants-of-suse-distros.patch 9b99eff7-add-opensuse-13.x-tests.patch f5a13510-clone-dont-use-separator-when-disk-under-root.patch - Upstream support for suse distros 9ea3fcd1-add-classes-for-SUSE-distros.patch 23f262ec-fetch-URL-media-from-content-file-for-suse-distros.patch 5618fa4c-add-support-for-detecting-os-variants-of-suse-distros.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=237
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
Enhancement to detect windows media. It is based solely upon
|
|
finding an autorun.inf file in the root of the installation source.
|
|
It only assumes windows, not the specific version of windows.
|
|
Index: virt-manager-1.2.0/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.2.0.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.2.0/virtinst/urlfetcher.py
|
|
@@ -408,6 +408,24 @@ def _distroFromSUSEContent(fetcher, arch
|
|
return ob
|
|
|
|
|
|
+def _distroFromAutorun(fetcher, arch, vmtype=None):
|
|
+ # Just look for autorun.inf (also in uppercase)
|
|
+ # If present media is likely from a windows iso.
|
|
+ distro_version = None
|
|
+ if not fetcher.hasFile("autorun.inf"):
|
|
+ return None
|
|
+
|
|
+ dclass = WindowsDistro
|
|
+
|
|
+ ob = dclass(fetcher, arch, vmtype)
|
|
+ if dclass != GenericDistro:
|
|
+ ob.content = distro_version
|
|
+
|
|
+ # Explictly call this, so we populate os_type/variant info
|
|
+ ob.isValidStore()
|
|
+
|
|
+ return ob
|
|
+
|
|
def getDistroStore(guest, fetcher):
|
|
stores = []
|
|
logging.debug("Finding distro store for location=%s", fetcher.location)
|
|
@@ -427,6 +445,10 @@ def getDistroStore(guest, fetcher):
|
|
if dist:
|
|
return dist
|
|
|
|
+ dist = _distroFromAutorun(fetcher, arch, _type)
|
|
+ if dist:
|
|
+ return dist
|
|
+
|
|
stores = _allstores[:]
|
|
|
|
# If user manually specified an os_distro, bump it's URL class
|
|
@@ -1175,6 +1197,13 @@ class ALTLinuxDistro(Distro):
|
|
logging.debug("Regex didn't match, not a %s distro", self.name)
|
|
return False
|
|
|
|
+class WindowsDistro(Distro):
|
|
+
|
|
+ urldistro = "windows"
|
|
+ os_variant = "win8.1"
|
|
+
|
|
+ def isValidStore(self):
|
|
+ return False
|
|
|
|
# Build list of all *Distro classes
|
|
def _build_distro_list():
|