4648861824
535584ed-fix-target-validation-when-editing-device.patch - bnc#874408 - virt-manager and libvirt issues persist - unable to create or launch virtman-vminstall.patch - Upstream bug fix 5350d9cc-display-error-on-empty-installation-URL.patch - Dropped unused and unnecessary patches virtinst-cdrom.patch virtman-update-backend.patch virtman-slow-mouse.patch virtman-reverse-serialcon.patch - Reordered some patches - Upstream bug fixes 534bcfa0-use-uniformed-expression-of-Default.patch 534be092-early-detect-ftp-connection-errors.patch 534d45db-hiding-removebutton-for-USB-controller.patch 534d6406-display-the-domain-for-PCI-devices.patch 534eafe4-avoid-useless-errors-when-connection-closes.patch - bnc#872789 - XEN domain fails to start when xen disk is atttached virtinst-xenbus-disk-index-fix.patch - bnc#872777 - virt-manager - Error shutting down domain: internal error: Failed to shutdown domain '3' with libxenlight virtman-shutdown-with-acpi-button.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=166
73 lines
3.4 KiB
Diff
73 lines
3.4 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
|
|
@@ -1230,11 +1230,34 @@ class vmmCreate(vmmGObjectUI):
|
|
variant = self.widget("install-os-version")
|
|
variant.set_active(0)
|
|
|
|
+ def _update_kickstart_label(self):
|
|
+ # Update label based on os version selected to either kickstart or autoyast
|
|
+ combo = self.widget("install-os-version")
|
|
+ if combo.get_active() != -1:
|
|
+ tree_iter = combo.get_active_iter()
|
|
+ if tree_iter != None:
|
|
+ model = combo.get_model()
|
|
+ unused, os_name = model[tree_iter][:2]
|
|
+ else:
|
|
+ entry = combo.get_child()
|
|
+ os_name = entry.get_text()
|
|
+ if os_name:
|
|
+ os_name = os_name.lower()
|
|
+ label = self.widget("kickstart-url-label")
|
|
+ if label and os_name:
|
|
+ if os_name.startswith('opensuse') or os_name.startswith('suse') or os_name.startswith('novell'):
|
|
+ label.set_text("AutoYaST URL:")
|
|
+ else:
|
|
+ label.set_text("Kickstart URL:")
|
|
+ label.show()
|
|
+
|
|
def change_os_version(self, box):
|
|
show_all = uiutil.get_list_selection(box, 3)
|
|
if not show_all:
|
|
return
|
|
|
|
+ self._update_kickstart_label()
|
|
+
|
|
# Get previous
|
|
type_row = self._selected_os_row()
|
|
if not type_row:
|
|
@@ -1589,7 +1612,10 @@ class vmmCreate(vmmGObjectUI):
|
|
if extra:
|
|
extraargs += extra
|
|
if ks:
|
|
- extraargs += " ks=%s" % ks
|
|
+ if variant.startswith('opensuse') or variant.startswith('sle') or variant.startswith('oes'):
|
|
+ extraargs += " autoyast=%s" % ks
|
|
+ else:
|
|
+ extraargs += " ks=%s" % ks
|
|
|
|
if extraargs:
|
|
self.guest.installer.extraargs = extraargs
|
|
@@ -1985,6 +2011,7 @@ class vmmCreate(vmmGObjectUI):
|
|
dl = self.set_os_val(self.widget("install-os-type"), distro_type)
|
|
vl = self.set_os_val(self.widget("install-os-version"), distro_var)
|
|
self.set_distro_labels(dl, vl)
|
|
+ self._update_kickstart_label()
|
|
|
|
def check_detection(self, idx, forward):
|
|
results = None
|
|
Index: virt-manager-1.0.1/ui/create.ui
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/ui/create.ui
|
|
+++ virt-manager-1.0.1/ui/create.ui
|
|
@@ -869,7 +869,7 @@ bar</property>
|
|
<property name="column_spacing">6</property>
|
|
<property name="row_spacing">4</property>
|
|
<child>
|
|
- <object class="GtkLabel" id="label25">
|
|
+ <object class="GtkLabel" id="kickstart-url-label">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="xalign">0</property>
|