Skip to content

Commit

Permalink
- show the info about possibility to download drivers
Browse files Browse the repository at this point in the history
  from drivers.suse.com (fate#312875)
- added KVM installation scenario (bnc#795067)
- 2.17.100
  • Loading branch information
jsuchome committed Dec 21, 2012
1 parent 0cff7dd commit e27e9fe
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 4 deletions.
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.17.99
2.17.100
6 changes: 6 additions & 0 deletions control/control.SLES.xml
Expand Up @@ -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') -->
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 8 additions & 0 deletions 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

Expand Down
5 changes: 4 additions & 1 deletion src/clients/inst_mode.ycp
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions src/clients/inst_scenarios.ycp
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions src/clients/inst_system_analysis.ycp
Expand Up @@ -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.
Expand All @@ -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.
"));
}

Expand Down

0 comments on commit e27e9fe

Please sign in to comment.