Update VirtConfig.rb

yast · Feb 9, 2018 · 2187fa6 · 2187fa6
1 parent be0c29a
commit 2187fa6
Showing 1 changed file with 50 additions and 21 deletions.
diff --git a/src/modules/VirtConfig.rb b/src/modules/VirtConfig.rb
@@ -153,6 +153,52 @@ def isPAEKernel
       isPAE
     end
 
+    # Check for TextMode only
+    def installGUIComponents(packages)
+      inst_gui = true
+
+      Builtins.y2milestone("Checking for TextMode display")
+
+      kvm_index = packages.index("patterns-server-kvm_tools")
+      xen_index = packages.index("patterns-server-xen_tools")
+
+      if kvm_index != nil || xen_index != nil
+        # The tools patterns install gui components. If in text mode we may not want them
+        if Ops.get_boolean(UI.GetDisplayInfo, "TextMode", true) == true
+          inst_gui = Popup.YesNo(
+            _("Running in text mode. Install graphical components anyway?")
+          )
+        end
+      end
+      if inst_gui == false
+        # Text Mode Only.
+        Builtins.y2milestone("Requested not to install graphical components")
+        Builtins.y2milestone("Current package list = %1", packages)
+        common_packages = ["libvirt-client", "libvirt-daemon-config-network", "virt-manager-common", "virt-install", "vm-install"]
+        add_common = false
+
+        # The tools patterns will pull in graphical components so drop entire pattern if present
+        if kvm_index != nil
+          packages = Builtins.remove(packages, kvm_index)
+          packages = Builtins.add(packages, "libvirt-daemon-qemu")
+          add_common = true
+        end
+
+        if xen_index != nil
+          packages = Builtins.remove(packages, xen_index)
+          packages = Builtins.add(packages, "libvirt-daemon-xen")
+          add_common = true
+        end
+
+        if add_common == true
+          packages = packages + common_packages
+        end
+        Builtins.y2milestone("Non-gui package list = %1", packages)
+      end
+
+      return packages
+    end
+
     def reloadApparmor
       if Package.InstalledAll(["apparmor"])
         cmd = "systemctl restart apparmor.service"
@@ -395,12 +441,12 @@ def LXCDialog
       packages = []
       common_vm_packages = []
 
-      if install_vm == true
-        common_vm_packages = ["libvirt-client", "vm-install", "virt-install", "bridge-utils"]
-      end
-
       result = true
       if isOpenSuse == true
+        if install_vm == true
+          common_vm_packages = ["libvirt-client", "vm-install", "virt-install"]
+        end
+
 	if isTumbleweed == true
           packages = ["patterns-server-xen_server"] if install_xen_server
 	else
@@ -441,23 +487,6 @@ def LXCDialog
         end
       end
 
-      inst_gui = true
-
-      Builtins.y2milestone("VirtConfig::ConfigureDom0 Checking for packages...")
-
-      # Assume python gtk is installed. If in text mode we don't care
-      if Ops.get_boolean(UI.GetDisplayInfo, "TextMode", true) == true
-        inst_gui = Popup.YesNo(
-          _("Running in text mode. Install graphical components anyway?")
-        )
-      end
-      if inst_gui == true
-        packages = Builtins.add(packages, "python-gtk")
-        # Also make sure virt-manager and virt-viewer is there - runs GUI only
-        packages = Builtins.add(packages, "virt-manager")
-        packages = Builtins.add(packages, "virt-viewer")
-      end
-
       success = true
 
       # progressbar title - check whether Xen packages are installed