Exclude S390 from virtualization proposals. bnc#817943

yast · May 16, 2013 · 402c909 · 402c909
1 parent 816aafc
commit 402c909
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/clients/lan_proposal.ycp b/src/clients/lan_proposal.ycp
@@ -32,6 +32,24 @@ string func = args[0]:"";
 map param = args[1]:$[];
 map ret = $[];
 
+/*
+ * Decides if a proposal for virtualization host machine is required.
+ */
+define boolean VirtProposalRequired()
+{
+    // S390 has special requirements. See bnc#817943
+    if( Arch::s390() )
+        return false;
+
+    if( PackageSystem::Installed("xen") && !Arch::is_xenU()) 
+        return true;
+    if( PackageSystem::Installed("kvm") )
+        return true;
+    if( PackageSystem::Installed("qemu"))
+        return true;
+
+    return false;
+}
 
 /* create a textual proposal */
 if(func == "MakeProposal") {
@@ -67,11 +85,7 @@ if(func == "MakeProposal") {
 
         if (Lan::virt_net_proposal==nil)
         {
-            if((PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")||
-                    PackageSystem::Installed("qemu"))
-                Lan::virt_net_proposal = true;
-            else 
-                Lan::virt_net_proposal = false;
+            Lan::virt_net_proposal = VirtProposalRequired();
         }
 
         Lan::Propose();