ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
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.4.3/virtManager/create.py
|
|
===================================================================
|
|
--- virt-manager-1.4.3.orig/virtManager/create.py
|
|
+++ virt-manager-1.4.3/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
|
|
@@ -1505,6 +1508,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 == 'linux2':
|
|
+ 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()
|
|
|
|
@@ -1517,6 +1577,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"))
|