pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Use correct kernel argument for specifying autoyast files.

Browse Source 
Renamed virtman-autoyast-label.patch to
  virtman-autoyast-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=123
This commit is contained in:
Charles Arnold 2013-07-25 20:51:25 +00:00 committed by Git OBS Bridge
parent 67c83dfe33
commit 6911f7e91e
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 25 11:34:07 MDT 2013 - carnold@suse.com
- 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 - carnold@suse.com Tue Jul 23 15:37:06 MDT 2013 - carnold@suse.com

2
virt-manager.spec
View File

@ -48,7 +48,7 @@ Patch66: virtman-vminstall.patch
Patch67: virtman-reverse-serialcon.patch Patch67: virtman-reverse-serialcon.patch
Patch68: virtman-default-guest-from-host-os.patch Patch68: virtman-default-guest-from-host-os.patch
Patch69: virtman-allow-pv-iso-install.patch Patch69: virtman-allow-pv-iso-install.patch
Patch70: virtman-autoyast-label.patch Patch70: virtman-autoyast-support.patch
ExclusiveArch: %{ix86} x86_64 s390x ExclusiveArch: %{ix86} x86_64 s390x
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq %gconf_schemas_prereq

16
virtman-autoyast-label.patch → virtman-autoyast-support.patch
View File

@ -14,7 +14,7 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
+ label = self.widget("kickstart-url-label") + label = self.widget("kickstart-url-label")
+ if label and os_ver: + if label and os_ver:
+ if os_ver.startswith('opensuse') or os_ver.startswith('sle') or os_ver.startswith('oes'): + if os_ver.startswith('opensuse') or os_ver.startswith('sle') or os_ver.startswith('oes'):
+ label.set_text("AutoYaST file:") + label.set_text("AutoYaST URL:")
+ else: + else:
+ label.set_text("Kickstart URL:") + label.set_text("Kickstart URL:")
+ +
@ -29,7 +29,19 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
# Get previous # Get previous
os_type_list = self.widget("install-os-type") os_type_list = self.widget("install-os-type")
os_type_model = os_type_list.get_model() os_type_model = os_type_list.get_model()
@@ -2121,6 +2135,7 @@ class vmmCreate(vmmGObjectUI): @@ -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) dl = self.set_os_val(self.widget("install-os-type"), distro)
vl = self.set_os_val(self.widget("install-os-version"), ver) vl = self.set_os_val(self.widget("install-os-version"), ver)
self.set_distro_labels(dl, vl) self.set_distro_labels(dl, vl)