Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2017-10-19 19:30:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm" Thu Oct 19 19:30:47 2017 rev:76 rq:534217 version:3.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2017-07-22 02:31:33.707000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2017-10-19 19:30:49.016581660 +0200 @@ -1,0 +2,13 @@ +Wed Oct 11 14:59:40 UTC 2017 - agin...@suse.com + +- use new pattern name for SLES (same as TW) +- Remove SLED as this is no more needed +- BSC#1055459 +- 3.2.3 + +------------------------------------------------------------------- + +Wed Jul 19 14:02:32 UTC 2017 - zgock...@gmail.com +- Fix package Install problem on Tumbleweed (bsc#1040042) + +------------------------------------------------------------------- Old: ---- yast2-vm-3.2.2.tar.bz2 New: ---- yast2-vm-3.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.HGGj1S/_old 2017-10-19 19:30:49.572555646 +0200 +++ /var/tmp/diff_new_pack.HGGj1S/_new 2017-10-19 19:30:49.572555646 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.2.2 +Version: 3.2.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-3.2.2.tar.bz2 -> yast2-vm-3.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.2.2/package/yast2-vm.changes new/yast2-vm-3.2.3/package/yast2-vm.changes --- old/yast2-vm-3.2.2/package/yast2-vm.changes 2017-07-19 16:34:47.259185694 +0200 +++ new/yast2-vm-3.2.3/package/yast2-vm.changes 2017-10-16 15:06:21.689188007 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Oct 11 14:59:40 UTC 2017 - agin...@suse.com + +- use new pattern name for SLES (same as TW) +- Remove SLED as this is no more needed +- BSC#1055459 +- 3.2.3 + +------------------------------------------------------------------- + +Wed Jul 19 14:02:32 UTC 2017 - zgock...@gmail.com +- Fix package Install problem on Tumbleweed (bsc#1040042) + +------------------------------------------------------------------- Wed Jul 19 12:36:51 UTC 2017 - jreidin...@suse.com - add proper dependency on yast2-bootloader (bsc#1048759) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.2.2/package/yast2-vm.spec new/yast2-vm-3.2.3/package/yast2-vm.spec --- old/yast2-vm-3.2.2/package/yast2-vm.spec 2017-07-19 16:34:47.259185694 +0200 +++ new/yast2-vm-3.2.3/package/yast2-vm.spec 2017-10-16 15:06:21.693188007 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.2.2 +Version: 3.2.3 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.2.2/src/modules/VirtConfig.rb new/yast2-vm-3.2.3/src/modules/VirtConfig.rb --- old/yast2-vm-3.2.2/src/modules/VirtConfig.rb 2017-07-19 16:34:47.263185694 +0200 +++ new/yast2-vm-3.2.3/src/modules/VirtConfig.rb 2017-10-16 15:06:21.693188007 +0200 @@ -99,15 +99,26 @@ end false end - def isSLED - Builtins.y2milestone("Checking to see if this is SLED ...") + def isTumbleweed + Builtins.y2milestone("Checking to see if this is Tumbleweed ...") distro = OSRelease.ReleaseName - if distro.include? "SLED" + if distro.include? "Tumbleweed" Builtins.y2milestone("Platform is %1", distro) return true end false end + def isSLES + Builtins.y2milestone("Checking to see if this is SLES ...") + distro = OSRelease.ReleaseName + if distro.include? "SLES" + Builtins.y2milestone("Platform is %1", distro) + return true + else + return false + end + false + end def isPAEKernel # check is we're running on 32 bit pae. @@ -280,25 +291,6 @@ ), ), ) - elsif isSLED == true - progress_stages = [ - _("Verify Installed Packages") - ] - UI.OpenDialog( - HBox( - HSpacing(2), - VBox( - VSpacing(1), - Frame(_("Software to connect to Virtualization server"), - HBox( - Left(CheckBox(Id(:client_tools), _("Virtualization client tools"))), - ), - ), - LXCDialog(), - VMButtonBox(), - ), - ), - ) else UI.OpenDialog( HBox( @@ -323,26 +315,31 @@ 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) end - elsif isSLED - # On SLED there is only a client pattern. The dialog has just a client and LXC checkbox - UI.ChangeWidget(Id(:client_tools), :Enabled, !Package.Installed("patterns-sled-virtualization_client")) - else - UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-sles-xen_server")) - UI.ChangeWidget(Id(:xen_tools), :Enabled, !Package.Installed("patterns-sles-xen_tools")) - UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-sles-kvm_server")) - UI.ChangeWidget(Id(:kvm_tools), :Enabled, !Package.Installed("patterns-sles-kvm_tools")) + elsif isSLES + UI.ChangeWidget(Id(:xen_server), :Enabled, !Package.Installed("patterns-server-xen_server")) + UI.ChangeWidget(Id(:xen_tools), :Enabled, !Package.Installed("patterns-server-xen_tools")) + UI.ChangeWidget(Id(:kvm_server), :Enabled, !Package.Installed("patterns-server-kvm_server")) + UI.ChangeWidget(Id(:kvm_tools), :Enabled, !Package.Installed("patterns-server-kvm_tools")) end if Package.Installed("libvirt-daemon-lxc") && Package.Installed("libvirt-daemon-config-network") UI.ChangeWidget(Id(:lxc), :Enabled, false) @@ -399,18 +396,22 @@ common_vm_packages = [] if install_vm == true - common_vm_packages = ["libvirt-client"] - # SLED doesn't have any installation capabilities (L3 support) - if isSLED == false - common_vm_packages = common_vm_packages + ["vm-install", "virt-install", "bridge-utils"] - end + common_vm_packages = ["libvirt-client", "vm-install", "virt-install", "bridge-utils"] end 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) @@ -427,17 +428,11 @@ return false end end - if isSLED == true - result = Package.DoInstall(["patterns-sled-virtualization_client"]) if install_client_tools - if result == false - Report.Error(_("Package installation failed for sled client pattern\n")) - return false - end - else - packages = packages + ["patterns-sles-xen_server"] if install_xen_server - packages = packages + ["patterns-sles-xen_tools"] if install_xen_tools - packages = packages + ["patterns-sles-kvm_server"] if install_kvm_server - packages = packages + ["patterns-sles-kvm_tools"] if install_kvm_tools + if isSLES + packages = packages + ["patterns-server-xen_server"] if install_xen_server + packages = packages + ["patterns-server-xen_tools"] if install_xen_tools + packages = packages + ["patterns-server-kvm_server"] if install_kvm_server + packages = packages + ["patterns-server-kvm_tools"] if install_kvm_tools result = Package.DoInstall(packages) if result == false Report.Error(_("Package installation failed for sles patterns\n")) @@ -500,30 +495,29 @@ end if is_s390 == false - # SLED is not a Virtualization Host so don't create a bridge - if isSLED == false - # Default Bridge stage - Progress.NextStage + # create a bridget for SLES host + # Default Bridge stage + Progress.NextStage - Progress.Title(_("Configuring Default Network Bridge...")) + Progress.Title(_("Configuring Default Network Bridge...")) - # Check for the existance of /sys/class/net/*/bridge - interfaces = Convert.convert( + # Check for the existance of /sys/class/net/*/bridge + interfaces = Convert.convert( SCR.Read(path(".target.dir"), @net_path), :from => "any", :to => "list <string>" - ) - Builtins.foreach(interfaces) do |i| - Builtins.y2milestone("Checking for bridges...") - bridge_path = Ops.add(Ops.add(Ops.add(@net_path, "/"), i), "/bridge") - if Ops.greater_or_equal(SCR.Read(path(".target.dir"), bridge_path), 0) - Builtins.y2milestone("Dom0 already has a configured bridge.") - bridge_exists = true - raise Break - end + ) + Builtins.foreach(interfaces) do |i| + Builtins.y2milestone("Checking for bridges...") + bridge_path = Ops.add(Ops.add(Ops.add(@net_path, "/"), i), "/bridge") + if Ops.greater_or_equal(SCR.Read(path(".target.dir"), bridge_path), 0) + Builtins.y2milestone("Dom0 already has a configured bridge.") + bridge_exists = true + raise Break end + end - # Popup yes/no dialog + # Popup yes/no dialog if bridge_exists == false if Popup.AnyQuestionRichText( _("Network Bridge."), @@ -541,7 +535,6 @@ Lan.ProposeVirtualized Lan.Write end - end end else # For s390, make sure /etc/zipl.conf contain switch_amode