From 6911f7e91edac02c58446786cadafd5acd7f7145 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Thu, 25 Jul 2013 20:51:25 +0000
Subject: [PATCH] - Use correct kernel argument for specifying autoyast files. 
  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
---
 virt-manager.changes                             |  7 +++++++
 virt-manager.spec                                |  2 +-
 ...label.patch => virtman-autoyast-support.patch | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 rename virtman-autoyast-label.patch => virtman-autoyast-support.patch (80%)

diff --git a/virt-manager.changes b/virt-manager.changes
index 82d16747..a7dde719 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -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
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 184f3d97..8fbd6fbf 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -48,7 +48,7 @@ Patch66:        virtman-vminstall.patch
 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
diff --git a/virtman-autoyast-label.patch b/virtman-autoyast-support.patch
similarity index 80%
rename from virtman-autoyast-label.patch
rename to virtman-autoyast-support.patch
index fb92386d..1457fed4 100644
--- a/virtman-autoyast-label.patch
+++ b/virtman-autoyast-support.patch
@@ -14,7 +14,7 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
 +            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 file:")
++                    label.set_text("AutoYaST URL:")
 +                else:
 +                    label.set_text("Kickstart URL:")
 +
@@ -29,7 +29,19 @@ Index: virt-manager-0.9.5/src/virtManager/create.py
          # Get previous
          os_type_list = self.widget("install-os-type")
          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)
          vl = self.set_os_val(self.widget("install-os-version"), ver)
          self.set_distro_labels(dl, vl)