Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 19 tumbleweed #20

Merged
merged 5 commits into from
Sep 13, 2017
Merged

Issue 19 tumbleweed #20

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e52dfc0
Fix package Install problem on Tumbleweed
May 25, 2017
ef87ae1
Revert "Fix package Install problem on Tumbleweed"
May 25, 2017
1bdb8d9
Fix patterns Install problem on openSUSE Tumbleweed - Issue 19
May 25, 2017
52cf19f
put bug number to changelog
zgock999 Jun 2, 2017
1a10755
Merge branch 'master' into issue-19-tumbleweed
jreidinger Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package/yast2-vm.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 25 14:02:32 UTC 2017 - zgock999@gmail.com
- Fix package Install problem on Tumbleweed
- 3.2.2

-------------------------------------------------------------------
Wed Mar 29 10:24:09 UTC 2017 - mfilka@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-vm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-vm
Version: 3.2.1
Version: 3.2.2
Release: 0
Group: System/YaST

Expand Down
33 changes: 29 additions & 4 deletions src/modules/VirtConfig.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down