Merge pull request #20 from zgock999/issue-19-tumbleweed

thanks for patch
yast · Sep 13, 2017 · 92fbac6 · 92fbac6
2 parents 4fe6820 + 1a10755
commit 92fbac6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/package/yast2-vm.changes b/package/yast2-vm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+
+Wed Jul 19 14:02:32 UTC 2017 - zgock999@gmail.com
+- Fix package Install problem on Tumbleweed (bsc#1040042)
+
 -------------------------------------------------------------------
 Wed Jul 19 12:36:51 UTC 2017 - jreidinger@suse.com
 

diff --git a/src/modules/VirtConfig.rb b/src/modules/VirtConfig.rb
@@ -99,6 +99,15 @@ def isOpenSuse
       end
       false
     end
+    def isTumbleweed
+      Builtins.y2milestone("Checking to see if this is Tumbleweed ...")
+      distro = OSRelease.ReleaseName
+      if distro.include? "Tumbleweed"
+        Builtins.y2milestone("Platform is %1", distro)
+        return true
+      end
+      false
+    end
     def isSLED
       Builtins.y2milestone("Checking to see if this is SLED ...")
       distro = OSRelease.ReleaseName
@@ -323,14 +332,22 @@ def LXCDialog
 
       log.info "VirtConfig::ConfigureDom0: Checking for Installed Patterns and Packages"
       if isOpenSuse
-        UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-openSUSE-xen_server"))
+	if isTumbleweed
+           UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-server-xen_server"))
+	else
+           UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-openSUSE-xen_server"))
+	end
         # On openSUSE there are no 'tools' patterns for Xen and KVM
         if Package.Installed("xen-tools") && Package.Installed("xen-libs") &&
            Package.Installed("libvirt-daemon-xen") && Package.Installed("tigervnc") &&
            Package.Installed("virt-manager")
           UI.ChangeWidget(Id(:xen_tools), :Enabled, false)
         end
-        UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-openSUSE-kvm_server"))
+	if isTumbleweed
+           UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-server-kvm_server"))
+	else
+           UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-openSUSE-kvm_server"))
+	end
         if Package.Installed("libvirt-daemon-qemu") || Package.Installed("tigervnc") ||
            Package.Installed("virt-manager")
           UI.ChangeWidget(Id(:kvm_tools), :Enabled, false)
@@ -408,9 +425,17 @@ def LXCDialog
 
       result = true
       if isOpenSuse == true
-        packages = ["patterns-openSUSE-xen_server"] if install_xen_server
+	if isTumbleweed == true
+          packages = ["patterns-server-xen_server"] if install_xen_server
+	else
+          packages = ["patterns-openSUSE-xen_server"] if install_xen_server
+	end
         packages = packages + ["xen-tools", "xen-libs", "libvirt-daemon-xen", "tigervnc", "virt-manager"] if install_xen_tools
-        packages = packages + ["patterns-openSUSE-kvm_server"] if install_kvm_server
+	if isTumbleweed == true
+          packages = packages + ["patterns-server-kvm_server"] if install_kvm_server
+	else
+          packages = packages + ["patterns-openSUSE-kvm_server"] if install_kvm_server
+	end
         packages = packages + ["libvirt-daemon-qemu", "tigervnc", "virt-manager"] if install_kvm_tools
         packages = packages + ["libvirt-daemon-lxc", "libvirt-daemon-config-network"] if install_lxc
         result = Package.DoInstall(common_vm_packages + packages)