766768c9d2
opensuse13.img for SLE-Server virtinst-detect-suse-distros.patch - bnc#881549 - virt-manager/xen: Error changing VM configuration: 'NoneType' object has no attribute 'split' virtinst-xenbus-disk-index-fix.patch - Upstream bug fix 538edb3b-manpage-fix-incorrect-description.patch - Upstream bug fixes 536677aa-better-handling-of-keyboard-input-type.patch 5385d602-lxc-no-default-disk.patch 53869170-virt-install-add-events-support.patch 538a11dc-raise-error-if-populating-summary-page-fails.patch 538a3609-virtconv-fix-use-of-relative-OVF-file.patch 538a3ba9-diskbackend-start-pool-if-not-running.patch 538ca3f3-use-correct-dictionary-keys-for-old-pool-net-polling.patch 538d00a4-xen-keyboard-cant-be-removed.patch 538e2f74-fix-pool-create-call.patch - Dropped 531e0a82-reverse-keyboard-grab-commit.patch. Fixed instead with this patch. 538a6862-vnc-dont-force-keyboard-grab-before-widget-is-realized.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=182
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:
|
|
@@ -1594,7 +1617,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
|
|
@@ -1990,6 +2016,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>
|