Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2018-05-17 19:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Thu May 17 19:32:48 2018 rev:262 rq:610083 version:4.0.34 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2018-05-11 09:13:10.921586009 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2018-05-17 19:32:51.088287349 +0200 @@ -1,0 +2,14 @@ +Thu May 17 12:34:52 UTC 2018 - [email protected] + +- Extend fix for BIOS RAIDs to work with more complex setup when + system contain also physical partitions (bsc#1092417) +- 4.0.34 + +------------------------------------------------------------------- +Mon May 14 07:29:05 UTC 2018 - [email protected] + +- Propose fips boot parameter if it is used for installation + on s390 (bsc#1043029) +- 4.0.33 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-4.0.32.tar.bz2 New: ---- yast2-bootloader-4.0.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.BE3Eis/_old 2018-05-17 19:32:51.640267183 +0200 +++ /var/tmp/diff_new_pack.BE3Eis/_new 2018-05-17 19:32:51.644267037 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.0.32 +Version: 4.0.34 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-4.0.32.tar.bz2 -> yast2-bootloader-4.0.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.32/package/yast2-bootloader.changes new/yast2-bootloader-4.0.34/package/yast2-bootloader.changes --- old/yast2-bootloader-4.0.32/package/yast2-bootloader.changes 2018-05-10 09:22:44.000000000 +0200 +++ new/yast2-bootloader-4.0.34/package/yast2-bootloader.changes 2018-05-17 15:25:28.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu May 17 12:34:52 UTC 2018 - [email protected] + +- Extend fix for BIOS RAIDs to work with more complex setup when + system contain also physical partitions (bsc#1092417) +- 4.0.34 + +------------------------------------------------------------------- +Mon May 14 07:29:05 UTC 2018 - [email protected] + +- Propose fips boot parameter if it is used for installation + on s390 (bsc#1043029) +- 4.0.33 + +------------------------------------------------------------------- Thu May 10 06:29:10 UTC 2018 - [email protected] - Fix installation on BIOS Raid like Intel RSTe (bsc#1091283) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.32/package/yast2-bootloader.spec new/yast2-bootloader-4.0.34/package/yast2-bootloader.spec --- old/yast2-bootloader-4.0.32/package/yast2-bootloader.spec 2018-05-10 09:22:44.000000000 +0200 +++ new/yast2-bootloader-4.0.34/package/yast2-bootloader.spec 2018-05-17 15:25:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.0.32 +Version: 4.0.34 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.32/src/modules/BootArch.rb new/yast2-bootloader-4.0.34/src/modules/BootArch.rb --- old/yast2-bootloader-4.0.32/src/modules/BootArch.rb 2018-05-10 09:22:44.000000000 +0200 +++ new/yast2-bootloader-4.0.34/src/modules/BootArch.rb 2018-05-17 15:25:28.000000000 +0200 @@ -33,6 +33,13 @@ Yast.import "Stage" end + # list of regexp to match kernel params that should be added + # from installation to running kernel on s390 (bsc#1086665) + S390_WHITELIST = [ + /net\.ifnames=\S*/, + /fips=\S*/ + ].freeze + # Get parameters for the default kernel # @param [String] resume string device to resume from (or empty not to set it) # @return [String] parameters for default kernel @@ -57,9 +64,9 @@ "hvc_iucv=8 TERM=dumb" end parameters = "#{features} #{termparm}" - # pick selected params from installation command line (bsc#1086665) - if kernel_cmdline =~ /(net\.ifnames=\S*)/ - parameters << " #{Regexp.last_match(1)}" + # pick selected params from installation command line + S390_WHITELIST.each do |pattern| + parameters << " #{Regexp.last_match(0)}" if kernel_cmdline =~ pattern end parameters << " resume=#{resume}" unless resume.empty? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.32/src/modules/BootStorage.rb new/yast2-bootloader-4.0.34/src/modules/BootStorage.rb --- old/yast2-bootloader-4.0.32/src/modules/BootStorage.rb 2018-05-10 09:22:44.000000000 +0200 +++ new/yast2-bootloader-4.0.34/src/modules/BootStorage.rb 2018-05-17 15:25:28.000000000 +0200 @@ -193,10 +193,14 @@ # to the real disk. multipaths = component.select { |a| a.is?(:multipath) } multipath_wires = multipaths.each_with_object([]) { |m, r| r.concat(m.parents) } + log.info "multipath devices #{multipaths.inspect} and its wires #{multipath_wires.inspect}" # And same for bios raids bios_raids = component.select { |a| a.is?(:bios_raid) } - raid_members = bios_raids.each_with_object([]) { |m, r| r.concat(m.parents) } + # raid can be more complex, so we need not only direct parents but all + # ancestors involved in RAID + raid_members = bios_raids.each_with_object([]) { |m, r| r.concat(m.ancestors) } + log.info "bios_raids devices #{bios_raids.inspect} and its members #{raid_members.inspect}" result = multipaths + disks + bios_raids - multipath_wires - raid_members diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.32/test/boot_arch_test.rb new/yast2-bootloader-4.0.34/test/boot_arch_test.rb --- old/yast2-bootloader-4.0.32/test/boot_arch_test.rb 2018-05-10 09:22:44.000000000 +0200 +++ new/yast2-bootloader-4.0.34/test/boot_arch_test.rb 2018-05-17 15:25:28.000000000 +0200 @@ -107,6 +107,15 @@ it "adds net.ifnames if boot command line contains it" do allow(Yast::Kernel).to receive(:GetCmdLine).and_return("danger kill=1 murder=allowed net.ifnames=1 anarchy=0") expect(subject.DefaultKernelParams("/dev/dasd2")).to include("net.ifnames=1") + end + + it "adds fips if boot command line contains it" do + allow(Yast::Kernel).to receive(:GetCmdLine).and_return("danger kill=1 murder=allowed fips=1 anarchy=0") + expect(subject.DefaultKernelParams("/dev/dasd2")).to include("fips=1") + end + + it "does not add other boot params" do + allow(Yast::Kernel).to receive(:GetCmdLine).and_return("danger kill=1 murder=allowed anarchy=0") expect(subject.DefaultKernelParams("/dev/dasd2")).to_not include("danger") expect(subject.DefaultKernelParams("/dev/dasd2")).to_not include("kill=1") expect(subject.DefaultKernelParams("/dev/dasd2")).to_not include("murder=allowed") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.32/test/test_helper.rb new/yast2-bootloader-4.0.34/test/test_helper.rb --- old/yast2-bootloader-4.0.32/test/test_helper.rb 2018-05-10 09:22:44.000000000 +0200 +++ new/yast2-bootloader-4.0.34/test/test_helper.rb 2018-05-17 15:25:28.000000000 +0200 @@ -1,5 +1,9 @@ ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) +# localization agnostic tests +ENV["LC_ALL"] = "en_US.utf-8" +ENV["LANG"] = "en_US.utf-8" + require "yast" require "yast/rspec" require "yaml"
