Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2013-07-29 09:25:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2013-07-08 12:36:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2013-07-29 09:25:58.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Jul 25 11:34:07 MDT 2013 - [email protected] + +- Use correct kernel argument for specifying autoyast files. + Renamed virtman-autoyast-label.patch to + virtman-autoyast-support.patch + +------------------------------------------------------------------- +Tue Jul 23 15:37:06 MDT 2013 - [email protected] + +- Add opensuse 13 as a host default for VM creation + +------------------------------------------------------------------- +Mon Jul 22 12:25:16 MDT 2013 - [email protected] + +- Fix kvm installs defaulting to qemu instead of kvm. + virtman-allow-pv-iso-install.patch + +------------------------------------------------------------------- +Wed Jul 17 14:48:48 MDT 2013 - [email protected] + +- Fix exception when selecting ISO for install source. + virtman-autoyast-label.patch + +------------------------------------------------------------------- Old: ---- virtman-autoyast-label.patch New: ---- virtman-autoyast-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.qyXo79/_old 2013-07-29 09:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.qyXo79/_new 2013-07-29 09:25:59.000000000 +0200 @@ -48,7 +48,7 @@ Patch67: virtman-reverse-serialcon.patch Patch68: virtman-default-guest-from-host-os.patch Patch69: virtman-allow-pv-iso-install.patch -Patch70: virtman-autoyast-label.patch +Patch70: virtman-autoyast-support.patch ExclusiveArch: %{ix86} x86_64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq ++++++ virtman-allow-pv-iso-install.patch ++++++ --- /var/tmp/diff_new_pack.qyXo79/_old 2013-07-29 09:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.qyXo79/_new 2013-07-29 09:25:59.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.5.orig/src/virtManager/create.py +++ virt-manager-0.9.5/src/virtManager/create.py -@@ -686,8 +686,13 @@ class vmmCreate(vmmGObjectUI): +@@ -686,11 +686,18 @@ class vmmCreate(vmmGObjectUI): default = len(model) if gtype == "xen": @@ -17,11 +17,8 @@ sensitive = False tooltip = _("Only URL or import installs are supported " "for paravirt.") -@@ -700,6 +705,7 @@ class vmmCreate(vmmGObjectUI): - util.tooltip_wrapper(hv_info, tooltip) - else: - hv_info.hide() -+ default = 0 ++ else: ++ default = 0 - hv_list.set_active(default) + model.append([label, gtype, domtype, sensitive]) ++++++ virtman-autoyast-support.patch ++++++ Index: virt-manager-0.9.5/src/virtManager/create.py =================================================================== --- virt-manager-0.9.5.orig/src/virtManager/create.py +++ virt-manager-0.9.5/src/virtManager/create.py @@ -1253,12 +1253,26 @@ 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 vs autoyast + combo = self.widget("install-os-version") + if combo.get_active() != -1: + os_ver = combo.get_active_text() + label = self.widget("kickstart-url-label") + if label and os_ver: + if os_ver.startswith('opensuse') or os_ver.startswith('sle') or os_ver.startswith('oes'): + label.set_text("AutoYaST URL:") + else: + label.set_text("Kickstart URL:") + def change_os_version(self, box): model = box.get_model() idx = box.get_active() if idx == -1: return + self._update_kickstart_label() + # Get previous os_type_list = self.widget("install-os-type") os_type_model = os_type_list.get_model() @@ -1648,7 +1662,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 @@ -2121,6 +2138,7 @@ class vmmCreate(vmmGObjectUI): dl = self.set_os_val(self.widget("install-os-type"), distro) vl = self.set_os_val(self.widget("install-os-version"), ver) self.set_distro_labels(dl, vl) + self._update_kickstart_label() def check_detection(self, idx, forward): results = None Index: virt-manager-0.9.5/src/vmm-create.ui =================================================================== --- virt-manager-0.9.5.orig/src/vmm-create.ui +++ virt-manager-0.9.5/src/vmm-create.ui @@ -807,7 +807,7 @@ <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> ++++++ virtman-default-guest-from-host-os.patch ++++++ --- /var/tmp/diff_new_pack.qyXo79/_old 2013-07-29 09:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.qyXo79/_new 2013-07-29 09:25:59.000000000 +0200 @@ -11,7 +11,7 @@ import gtk -@@ -1159,6 +1161,47 @@ class vmmCreate(vmmGObjectUI): +@@ -1159,6 +1161,51 @@ class vmmCreate(vmmGObjectUI): return self.start_detection(forward=forward) @@ -22,10 +22,14 @@ + lines = f.readlines() + f.close() + for line in lines: -+ if "openSUSE" in line: ++ if "openSUSE 13" in line: ++ return 'linux', 'opensuse13' ++ if "openSUSE 12" in line: + return 'linux', 'opensuse12' -+ if "SUSE Linux Enterprise Server" in line: ++ 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: @@ -59,7 +63,7 @@ def toggle_detect_os(self, src): dodetect = src.get_active() -@@ -1174,6 +1217,7 @@ class vmmCreate(vmmGObjectUI): +@@ -1174,6 +1221,7 @@ class vmmCreate(vmmGObjectUI): self.widget("install-os-version-label").hide() self.widget("install-os-type").show() self.widget("install-os-version").show() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
