c085d819a8
virt-manager-1.5.0.tar.bz2 * python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat) * Switch –location ISO to use isoinfo (Andrew Wong) * virt-install: add –cpu numa distance handling (Menno Lageman) * virt-install: fix –disk for rbd volumes with auth (Rauno Väli) * virt-install: add –cputune vcpupin handling (Wim ten Have) * details ui: Showing attached scsi devices per controller (Lin Ma) * network ui: Show details about SR-IOV VF pool (Lin Ma) * Greatly expand UI test suite coverage - Dropped patches 0001-Improve-container-image-url-example.patch 0001-py3-store-exception-variables-for-use-outside-except.patch 0002-create-wizard-fix-alignment-in-os-container-page.patch 0003-oscontainer-ask-root-password-in-the-wizard.patch 0004-Harmonize-invisible_char-values.patch 083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch 0c6bcb09-fix-bytes-string-mess-in-serial-console.patch 0e812e3c-dont-skip-authentication-for-listen-type-none-with-fixed-QEMU.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch 2d276ebe-progress-dont-overwrite-format.patch 2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch 37ea5207-replace-StandardError-with-Exception.patch 3b769643-dont-add-URI-into-params-for-tunneled-migration.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 44de92b7-use-reload-from-imp-module.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 67122615-python2to3-division-compatability.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=406
90 lines
3.5 KiB
Diff
90 lines
3.5 KiB
Diff
Enhancement to default to the host os version when creating a VM
|
|
and media detection of the install source is turned off.
|
|
Index: virt-manager-1.5.0/virtManager/create.py
|
|
===================================================================
|
|
--- virt-manager-1.5.0.orig/virtManager/create.py
|
|
+++ virt-manager-1.5.0/virtManager/create.py
|
|
@@ -24,6 +24,9 @@ import pkgutil
|
|
import os
|
|
import threading
|
|
import time
|
|
+import sys
|
|
+import os
|
|
+import re
|
|
|
|
from gi.repository import GObject
|
|
from gi.repository import Gtk
|
|
@@ -1511,6 +1514,63 @@ class vmmCreate(vmmGObjectUI):
|
|
def _cdrom_changed(self, src):
|
|
self._detectable_media_widget_changed(src)
|
|
|
|
+ def _lookup_host_os(self):
|
|
+ def _lookup_sp(line):
|
|
+ sp = ""
|
|
+ m = re.search(' SP[1234] ', line)
|
|
+ if m:
|
|
+ sp = m.group(0).strip().lower()
|
|
+ return sp
|
|
+ if sys.platform.startswith('linux'):
|
|
+ if os.path.exists('/etc/issue'):
|
|
+ f = open('/etc/issue')
|
|
+ lines = f.readlines()
|
|
+ f.close()
|
|
+ for line in lines:
|
|
+ if "openSUSE " in line:
|
|
+ parts = line.split(' ')
|
|
+ if len(parts) > 2 and len(parts[3]) <= 4:
|
|
+ os_ver = "opensuse" + parts[3]
|
|
+ return 'linux', os_ver
|
|
+ return 'linux', 'opensuse42.2'
|
|
+ if "SUSE Linux Enterprise Server 15" in line:
|
|
+ return 'linux', ('sles15' + _lookup_sp(line))
|
|
+ if "SUSE Linux Enterprise Server 12" in line:
|
|
+ return 'linux', ('sles12' + _lookup_sp(line))
|
|
+ if "SUSE Linux Enterprise Server 11" in line:
|
|
+ return 'linux', ('sles11' + _lookup_sp(line))
|
|
+ if "SUSE Linux Enterprise Desktop 15" in line:
|
|
+ return 'linux', ('sled15' + _lookup_sp(line))
|
|
+ if "SUSE Linux Enterprise Desktop 12" in line:
|
|
+ return 'linux', ('sled12' + _lookup_sp(line))
|
|
+ if "SUSE Linux Enterprise Desktop 11" in line:
|
|
+ return 'linux', ('sled11' + _lookup_sp(line))
|
|
+ return None, None
|
|
+
|
|
+ def detect_host_os(self):
|
|
+ box = self.widget('install-os-type')
|
|
+ if box.get_active() <= 0:
|
|
+ os_type, os_variant = self._lookup_host_os()
|
|
+ if os_type is None:
|
|
+ return
|
|
+ model = box.get_model()
|
|
+ index = 0
|
|
+ for row in model:
|
|
+ if row[0] == 'linux':
|
|
+ box.set_active(index)
|
|
+ break
|
|
+ index += 1
|
|
+ if os_variant is None:
|
|
+ return
|
|
+ box = self.widget('install-os-version')
|
|
+ model = box.get_model()
|
|
+ index = 0
|
|
+ for row in model:
|
|
+ if row[0] == os_variant:
|
|
+ box.set_active(index)
|
|
+ break
|
|
+ index += 1
|
|
+
|
|
def _toggle_detect_os(self, src):
|
|
dodetect = src.get_active()
|
|
|
|
@@ -1523,6 +1583,8 @@ class vmmCreate(vmmGObjectUI):
|
|
self.widget("install-os-version-entry").set_text("")
|
|
self._os_already_detected_for_media = False
|
|
self._start_detect_os_if_needed()
|
|
+ else:
|
|
+ self.detect_host_os()
|
|
|
|
def _selected_os_row(self):
|
|
return uiutil.get_list_selected_row(self.widget("install-os-type"))
|