From e27e9fe77188a59e55d2f458dfe4caccf5b78c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jsuchome@suse.cz>
Date: Fri, 21 Dec 2012 09:48:30 +0100
Subject: [PATCH] - show the info about possibility to download drivers   from
 drivers.suse.com (fate#312875) - added KVM installation scenario (bnc#795067)
 - 2.17.100

---
 VERSION                              | 2 +-
 control/control.SLES.xml             | 6 ++++++
 package/yast2-installation.changes   | 8 ++++++++
 src/clients/inst_mode.ycp            | 5 ++++-
 src/clients/inst_scenarios.ycp       | 4 ++--
 src/clients/inst_system_analysis.ycp | 4 ++++
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index 9d3d71917..fa286fb6a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.17.99
+2.17.100
diff --git a/control/control.SLES.xml b/control/control.SLES.xml
index 6c4064ba7..64cfedbd0 100644
--- a/control/control.SLES.xml
+++ b/control/control.SLES.xml
@@ -161,6 +161,11 @@ textdomain="control"
 		<patterns>Dom0</patterns>
 		<icon>yast-vm-management</icon>
 	    </system_scenario>
+            <system_scenario>
+                <id>scenario_kvm_virtualization_host</id>
+                <patterns>Dom0_KVM</patterns>
+                <icon>yast-vm-management</icon>
+            </system_scenario>
 	</system_scenarios>
 
 	<!-- default selection for 'system_scenarios' (matches one 'id') -->
@@ -329,6 +334,7 @@ Choose the one that matches your server the best.</label></scenarios_text>
 	<scenario_physical_machine><label>Physical Machine (Also for Fully Virtualized Guests)</label></scenario_physical_machine>
 	<scenario_virtual_machine><label>Virtual Machine (For Paravirtualized Environments Like Xen)</label></scenario_virtual_machine>
 	<scenario_virtualization_host><label>Xen Virtualization Host (Local X11 Not Configured by Default)</label></scenario_virtualization_host>
+        <scenario_kvm_virtualization_host><label>KVM Virtualization Host (Local X11 Not Configured by Default)</label></scenario_kvm_virtualization_host>
 
 	<!-- FATE #305583: Start CIMOM by default -->
 	<service_sfcb><label>CIM Server</label></service_sfcb>
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
index ef31384d6..ac54c87e1 100644
--- a/package/yast2-installation.changes
+++ b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec 21 09:01:04 CET 2012 - jsuchome@suse.cz
+
+- show the info about possibility to download drivers
+  from drivers.suse.com (fate#312875) 
+- added KVM installation scenario (bnc#795067) 
+- 2.17.100
+
 -------------------------------------------------------------------
 Fri Jan 20 15:53:12 CET 2012 - locilka@suse.cz
 
diff --git a/src/clients/inst_mode.ycp b/src/clients/inst_mode.ycp
index 5247f58a6..79d2321cc 100644
--- a/src/clients/inst_mode.ycp
+++ b/src/clients/inst_mode.ycp
@@ -230,7 +230,10 @@ your hard disk. This option can try to fix problems automatically.
     _("<p>The features <b>Update</b> and <b>Repair Installed System</b> are only
 available if an existing Linux system has been detected.
 </p>
-");
+") +
+
+  // help text: additional help for installation
+  _("<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i>.</p>");
 }
 
 Wizard::SetContents (
diff --git a/src/clients/inst_scenarios.ycp b/src/clients/inst_scenarios.ycp
index e4e0643ef..2472149bc 100644
--- a/src/clients/inst_scenarios.ycp
+++ b/src/clients/inst_scenarios.ycp
@@ -42,9 +42,9 @@
 
     list <map <string, string> > system_scenarios = (list <map <string, string> >) any_scenarios;
 
-    // Remove Xen Virtualization Host Server Installation for non-x86_64 (bnc#702103)
+    // Remove Xen/KVM Virtualization Host Server Installation for non-x86_64 (bnc#702103, bnc#795067)
     system_scenarios	= filter (map <string, string> one_scenario, system_scenarios, {
-	if (one_scenario["id"]:"---" == "scenario_virtualization_host" && !Arch::x86_64 ())
+	if (issubstring (one_scenario["id"]:"---", "virtualization_host") && !Arch::x86_64 ())
 	{
 	    y2milestone ("removing Xen Virtualization Host Server option");
 	    return false;
diff --git a/src/clients/inst_system_analysis.ycp b/src/clients/inst_system_analysis.ycp
index e252006fa..883cfb87e 100644
--- a/src/clients/inst_system_analysis.ycp
+++ b/src/clients/inst_system_analysis.ycp
@@ -116,6 +116,8 @@ include "packager/storage_include.ycp";
                         // pop-up error report
                         Report::Error(_("No hard disks were found for the installation.
 Please check your hardware!
+
+Check 'drivers.suse.com' if you need specific hardware drivers for installation.
 "));
                 } else {
                         Report::Warning(_("No hard disks were found for the installation.
@@ -128,6 +130,8 @@ During an automatic installation, they might be detected later.
 		Report::Error(_("No hard disks and no hard disk controllers were
 found for the installation.
 Check your hardware.
+
+Check 'drivers.suse.com' if you need specific hardware drivers for installation.
 "));
 	    }