Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2024-01-29 22:26:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Mon Jan 29 22:26:57 2024 rev:556 rq:1142195 version:5.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2024-01-25 18:39:51.675780032 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new.1815/yast2.changes 2024-01-29 22:27:02.789161931 +0100 @@ -1,0 +2,6 @@ +Fri Jan 26 15:59:21 UTC 2024 - Knut Anderssen <[email protected]> + +- Added s390 z/VM check to YaST::Arch (bsc#1210525). +- 5.0.5 + +------------------------------------------------------------------- Old: ---- yast2-5.0.4.tar.bz2 New: ---- yast2-5.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.5Mql12/_old 2024-01-29 22:27:03.545189334 +0100 +++ /var/tmp/diff_new_pack.5Mql12/_new 2024-01-29 22:27:03.549189479 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 5.0.4 +Version: 5.0.5 Release: 0 Summary: YaST2 Main Package ++++++ yast2-5.0.4.tar.bz2 -> yast2-5.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-5.0.4/library/general/src/modules/Arch.rb new/yast2-5.0.5/library/general/src/modules/Arch.rb --- old/yast2-5.0.4/library/general/src/modules/Arch.rb 2024-01-24 10:24:12.000000000 +0100 +++ new/yast2-5.0.5/library/general/src/modules/Arch.rb 2024-01-29 09:50:31.000000000 +0100 @@ -62,6 +62,9 @@ # zKVM @_is_zkvm = nil + + # zVM + @_is_zvm = nil end # ************************************************************ @@ -466,6 +469,22 @@ end # ************************************************************ + # zVM stuff + + # zVM means VM on IBM System z + # true if zVM is running + # + # @return true if we are running on zVM hypervisor + def is_zvm + if @_is_zvm.nil? + # using different check than on x86 as recommended by IBM + @_is_zvm = s390 && Yast::WFM.Execute(path(".local.bash"), "/usr/bin/grep 'Control Program: z\/VM' /proc/sysinfo") == 0 + end + + @_is_zvm + end + + # ************************************************************ # SMP stuff # Set "Arch::has_smp ()". Since Alpha doesn't reliably probe smp, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-5.0.4/library/general/test/arch_test.rb new/yast2-5.0.5/library/general/test/arch_test.rb --- old/yast2-5.0.4/library/general/test/arch_test.rb 2024-01-24 10:24:12.000000000 +0100 +++ new/yast2-5.0.5/library/general/test/arch_test.rb 2024-01-29 09:50:31.000000000 +0100 @@ -221,6 +221,35 @@ end end + describe ".is_zvm" do + it "returns true if on s390 and in the zVM environment" do + allow(Yast::WFM).to receive(:Execute).and_return 0 + allow(Yast::SCR).to receive(:Read).and_return "s390_64" + + is_zvm = Yast::Arch.is_zvm + + expect(is_zvm).to eq(true) + end + + it "returns false if on s390 and not in the zVM environment" do + allow(Yast::WFM).to receive(:Execute).and_return 1 + allow(Yast::SCR).to receive(:Read).and_return "s390_64" + + is_zvm = Yast::Arch.is_zvm + + expect(is_zvm).to eq(false) + end + + it "returns false on other architectures" do + allow(Yast::WFM).to receive(:Execute).and_return 0 + allow(Yast::SCR).to receive(:Read).and_return "x86_64" + + is_zvm = Yast::Arch.is_zvm + + expect(is_zvm).to eq(false) + end + end + describe ".is_wsl" do before do allow(Yast::SCR).to receive(:Read) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-5.0.4/package/yast2.changes new/yast2-5.0.5/package/yast2.changes --- old/yast2-5.0.4/package/yast2.changes 2024-01-24 10:24:12.000000000 +0100 +++ new/yast2-5.0.5/package/yast2.changes 2024-01-29 09:50:31.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 26 15:59:21 UTC 2024 - Knut Anderssen <[email protected]> + +- Added s390 z/VM check to YaST::Arch (bsc#1210525). +- 5.0.5 + +------------------------------------------------------------------- Tue Jan 23 12:52:08 UTC 2024 - Josef Reidinger <[email protected]> - Reading Kernel Params: Use kernel cmdline when install.inf is not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-5.0.4/package/yast2.spec new/yast2-5.0.5/package/yast2.spec --- old/yast2-5.0.4/package/yast2.spec 2024-01-24 10:24:12.000000000 +0100 +++ new/yast2-5.0.5/package/yast2.spec 2024-01-29 09:50:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 5.0.4 +Version: 5.0.5 Release: 0 Summary: YaST2 Main Package
