Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2018-07-24 17:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Tue Jul 24 17:28:47 2018 rev:266 rq:624667 version:4.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2018-07-03 23:32:31.488566110 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2018-07-24 17:28:53.883797440 +0200 @@ -1,0 +2,7 @@ +Fri Jul 20 15:12:13 CEST 2018 - [email protected] + +- Update: Fixed crash while reading grub settings from installed + system (bsc#1094031). +- 4.1.6 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-4.1.5.tar.bz2 New: ---- yast2-bootloader-4.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.lUwHfq/_old 2018-07-24 17:28:54.347798028 +0200 +++ /var/tmp/diff_new_pack.lUwHfq/_new 2018-07-24 17:28:54.351798032 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.1.5 +Version: 4.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-4.1.5.tar.bz2 -> yast2-bootloader-4.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.5/package/yast2-bootloader.changes new/yast2-bootloader-4.1.6/package/yast2-bootloader.changes --- old/yast2-bootloader-4.1.5/package/yast2-bootloader.changes 2018-07-02 16:48:24.000000000 +0200 +++ new/yast2-bootloader-4.1.6/package/yast2-bootloader.changes 2018-07-23 10:19:29.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 20 15:12:13 CEST 2018 - [email protected] + +- Update: Fixed crash while reading grub settings from installed + system (bsc#1094031). +- 4.1.6 + +------------------------------------------------------------------- Thu Jun 28 15:36:26 CEST 2018 - [email protected] - Added additional searchkeys to desktop file (fate#321043). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.5/package/yast2-bootloader.spec new/yast2-bootloader-4.1.6/package/yast2-bootloader.spec --- old/yast2-bootloader-4.1.5/package/yast2-bootloader.spec 2018-07-02 16:48:24.000000000 +0200 +++ new/yast2-bootloader-4.1.6/package/yast2-bootloader.spec 2018-07-23 10:19:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.1.5 +Version: 4.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.5/src/modules/Bootloader.rb new/yast2-bootloader-4.1.6/src/modules/Bootloader.rb --- old/yast2-bootloader-4.1.5/src/modules/Bootloader.rb 2018-07-02 16:48:24.000000000 +0200 +++ new/yast2-bootloader-4.1.6/src/modules/Bootloader.rb 2018-07-23 10:19:29.000000000 +0200 @@ -1,7 +1,7 @@ # encoding: utf-8 # File: -# modules/Bootloader.ycp +# modules/Bootloader.rb # # Module: # Bootloader installation and configuration @@ -30,6 +30,7 @@ Yast.import "Progress" Yast.import "Report" Yast.import "Stage" +Yast.import "Installation" module Yast class BootloaderClass < Module @@ -422,7 +423,23 @@ Propose() else progress_orig = Progress.set(false) + if Stage.initial && Mode.update + # SCR has been currently set to inst-sys. So we have + # set the SCR to installed system in order to read + # grub settings + old_SCR = WFM.SCRGetDefault + new_SCR = WFM.SCROpen("chroot=#{Yast::Installation.destdir}:scr", + false) + WFM.SCRSetDefault(new_SCR) + end Read() + if Stage.initial && Mode.update + # settings have been read from the target system + current_bl.read + # reset target system to inst-sys + WFM.SCRSetDefault(old_SCR) + WFM.SCRClose(new_SCR) + end Progress.set(progress_orig) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.1.5/test/bootloader_test.rb new/yast2-bootloader-4.1.6/test/bootloader_test.rb --- old/yast2-bootloader-4.1.5/test/bootloader_test.rb 2018-07-02 16:48:24.000000000 +0200 +++ new/yast2-bootloader-4.1.6/test/bootloader_test.rb 2018-07-23 10:19:29.000000000 +0200 @@ -110,6 +110,9 @@ it "reads configuration in update mode" do expect(subject).to_not receive(:Propose) + # switching SCR to Yast::Installation.destdir + expect(Yast::WFM).to receive(:SCROpen).with("chroot=#{Yast::Installation.destdir}:scr", + false) expect(subject).to receive(:Read) allow(Yast::Mode).to receive(:update).and_return(true) allow(Yast::Stage).to receive(:initial).and_return(true)
