4f22f7f4d5
5332ee4d-enable-media-detection-for-ISO-images.patch 53341e7e-hide-hardware-removal-for-non-devices.patch 53342f31-set-right-ip-address-for-ipv6.patch - bnc#870098 - virt-manager+x show wrong number of assigned cpu's virtman-init-vm-processor-topology.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=157
79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
Index: virt-manager-1.0.1/virtManager/create.py
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/virtManager/create.py
|
|
+++ virt-manager-1.0.1/virtManager/create.py
|
|
@@ -21,6 +21,8 @@
|
|
import logging
|
|
import threading
|
|
import time
|
|
+import sys
|
|
+import os
|
|
|
|
# pylint: disable=E0611
|
|
from gi.repository import GObject
|
|
@@ -1140,6 +1142,55 @@ class vmmCreate(vmmGObjectUI):
|
|
return
|
|
self.start_detection(forward=forward)
|
|
|
|
+ def _lookup_host_os(self):
|
|
+ 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 13" in line:
|
|
+ return 'linux', 'opensuse13'
|
|
+ if "openSUSE 12" in line:
|
|
+ return 'linux', 'opensuse12'
|
|
+ if "SUSE Linux Enterprise Server 12" in line:
|
|
+ return 'linux', 'sles12'
|
|
+ if "SUSE Linux Enterprise Desktop 12" in line:
|
|
+ return 'linux', 'sled12'
|
|
+ if "SUSE Linux Enterprise Server 11" in line:
|
|
+ return 'linux', 'sles11'
|
|
+ if "SUSE Linux Enterprise Desktop 11" in line:
|
|
+ return 'linux', 'sled11'
|
|
+ if "Fedora" in line:
|
|
+ return 'linux', 'fedora17'
|
|
+ if "Red Hat Enterprise Linux Server" in line:
|
|
+ return 'linux', 'rhel6'
|
|
+ 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()
|
|
|
|
@@ -1151,6 +1202,8 @@ class vmmCreate(vmmGObjectUI):
|
|
if dodetect:
|
|
self.mediaDetected = False
|
|
self.detect_media_os()
|
|
+ else:
|
|
+ self.detect_host_os()
|
|
|
|
def _selected_os_row(self):
|
|
return uiutil.get_list_selection(self.widget("install-os-type"))
|