Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2018-03-14 19:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Wed Mar 14 19:35:06 2018 rev:257 rq:586968 version:4.0.22 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2018-03-11 18:02:13.185483665 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2018-03-14 19:35:07.689534141 +0100 @@ -1,0 +2,14 @@ +Wed Mar 14 13:54:06 UTC 2018 - [email protected] + +- fix detection of kernel name for alternative raid names (it + ensures that fix for bsc#944041 works) +- 4.0.22 + +------------------------------------------------------------------- +Mon Mar 12 14:43:36 UTC 2018 - [email protected] + +- Respect if custom boot is logical volume and display it + correctly (bsc#1084815) +- 4.0.21 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-4.0.20.tar.bz2 New: ---- yast2-bootloader-4.0.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.iycDA2/_old 2018-03-14 19:35:08.897491238 +0100 +++ /var/tmp/diff_new_pack.iycDA2/_new 2018-03-14 19:35:08.901491096 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.0.20 +Version: 4.0.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-4.0.20.tar.bz2 -> yast2-bootloader-4.0.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.20/package/yast2-bootloader.changes new/yast2-bootloader-4.0.22/package/yast2-bootloader.changes --- old/yast2-bootloader-4.0.20/package/yast2-bootloader.changes 2018-03-07 15:11:36.000000000 +0100 +++ new/yast2-bootloader-4.0.22/package/yast2-bootloader.changes 2018-03-14 15:28:20.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Mar 14 13:54:06 UTC 2018 - [email protected] + +- fix detection of kernel name for alternative raid names (it + ensures that fix for bsc#944041 works) +- 4.0.22 + +------------------------------------------------------------------- +Mon Mar 12 14:43:36 UTC 2018 - [email protected] + +- Respect if custom boot is logical volume and display it + correctly (bsc#1084815) +- 4.0.21 + +------------------------------------------------------------------- Wed Mar 7 13:49:53 UTC 2018 - [email protected] - do not repropose configuration in autoyast confirm mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.20/package/yast2-bootloader.spec new/yast2-bootloader-4.0.22/package/yast2-bootloader.spec --- old/yast2-bootloader-4.0.20/package/yast2-bootloader.spec 2018-03-07 15:11:36.000000000 +0100 +++ new/yast2-bootloader-4.0.22/package/yast2-bootloader.spec 2018-03-14 15:28:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.0.20 +Version: 4.0.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.20/src/lib/bootloader/stage1.rb new/yast2-bootloader-4.0.22/src/lib/bootloader/stage1.rb --- old/yast2-bootloader-4.0.20/src/lib/bootloader/stage1.rb 2018-03-07 15:11:36.000000000 +0100 +++ new/yast2-bootloader-4.0.22/src/lib/bootloader/stage1.rb 2018-03-14 15:28:20.000000000 +0100 @@ -119,10 +119,9 @@ log.info "known devices #{known_devices.inspect}" devices.select do |dev| - stage1_for_dev = Yast::BootStorage.stage1_devices_for_name(dev).map(&:name) - log.info "stage1 devices for #{dev} is #{stage1_for_dev.inspect}" - # devices already covered by known devices by mbr or by partition - !(stage1_for_dev - known_devices).empty? + kernel_dev = Bootloader::UdevMapping.to_kernel_device(dev) + log.info "stage1 devices for #{dev} is #{kernel_dev.inspect}" + !known_devices.include?(kernel_dev) end end @@ -184,7 +183,7 @@ self.generic_mbr = generic_mbr? || other.generic_mbr? else clear_devices - other.devices.each { |d| add_udev_device(d) } + other.devices.each { |d| add_device(d) } self.activate = other.activate? self.generic_mbr = other.generic_mbr? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.20/src/lib/bootloader/udev_mapping.rb new/yast2-bootloader-4.0.22/src/lib/bootloader/udev_mapping.rb --- old/yast2-bootloader-4.0.20/src/lib/bootloader/udev_mapping.rb 2018-03-07 15:11:36.000000000 +0100 +++ new/yast2-bootloader-4.0.22/src/lib/bootloader/udev_mapping.rb 2018-03-14 15:28:20.000000000 +0100 @@ -30,12 +30,8 @@ log.info "call to_kernel_device for #{dev}" raise "invalid device nil" unless dev - # for non-udev devices try to see specific raid names (bnc#944041) - if dev =~ /^\/dev\/disk\/by-/ - udev_to_kernel(dev) - else - alternative_raid_to_kernel(dev) - end + # method udev_to_kernel works also for alternative raid names (bnc#944041) + udev_to_kernel(dev) end # Converts udev or kernel device (disk or partition) to udev name that fits best. @@ -150,24 +146,5 @@ def udev_by_path(device) device.udev_full_paths.first end - - def alternative_raid_to_kernel(dev) -# storage-ng -# FIXME -# rubocop:disable Style/BlockComments -=begin - param = Yast::ArgRef.new({}) - result = Yast::Storage.GetContVolInfo(dev, param) - return dev unless result # not raid with funny name - - info = param.value - return info["vdevice"] unless info["vdevice"].empty? - return info["cdevice"] unless info["cdevice"].empty? - - raise "unknown value for raid device '#{info.inspect}'" -=end - - dev - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.20/test/stage1_test.rb new/yast2-bootloader-4.0.22/test/stage1_test.rb --- old/yast2-bootloader-4.0.20/test/stage1_test.rb 2018-03-07 15:11:36.000000000 +0100 +++ new/yast2-bootloader-4.0.22/test/stage1_test.rb 2018-03-14 15:28:20.000000000 +0100 @@ -196,4 +196,17 @@ end end end + + describe "#merge" do + it "keeps logical volume if specified in other" do + devicegraph_stub("xfs.yaml") + + other = described_class.new + other.add_device("/dev/sda5") + + subject.merge(other) + + expect(subject.devices).to eq ["/dev/sda5"] + end + end end
