Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2015-08-15 11:39:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2015-08-10 09:09:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2015-08-15 11:39:08.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 14 15:17:16 CEST 2015 - [email protected] + +- as SCR hasn't been setup yet, use some trickery to read boot config (bsc #940486) +- 3.1.140 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.139.tar.bz2 New: ---- yast2-bootloader-3.1.140.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.rpEDq0/_old 2015-08-15 11:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.rpEDq0/_new 2015-08-15 11:39:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.139 +Version: 3.1.140 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.139.tar.bz2 -> yast2-bootloader-3.1.140.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.139/package/yast2-bootloader.changes new/yast2-bootloader-3.1.140/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.139/package/yast2-bootloader.changes 2015-08-05 15:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.140/package/yast2-bootloader.changes 2015-08-14 15:37:08.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 14 15:17:16 CEST 2015 - [email protected] + +- as SCR hasn't been setup yet, use some trickery to read boot config (bsc #940486) +- 3.1.140 + +------------------------------------------------------------------- Wed Aug 5 11:37:12 UTC 2015 - [email protected] - always run mkinitrd at the end of S/390 installation (bsc#933177) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.139/package/yast2-bootloader.spec new/yast2-bootloader-3.1.140/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.139/package/yast2-bootloader.spec 2015-08-05 15:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.140/package/yast2-bootloader.spec 2015-08-14 15:37:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.139 +Version: 3.1.140 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.139/src/lib/bootloader/proposal_client.rb new/yast2-bootloader-3.1.140/src/lib/bootloader/proposal_client.rb --- old/yast2-bootloader-3.1.139/src/lib/bootloader/proposal_client.rb 2015-08-05 15:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.140/src/lib/bootloader/proposal_client.rb 2015-08-14 15:37:08.000000000 +0200 @@ -16,6 +16,7 @@ Yast.import "Storage" Yast.import "Mode" Yast.import "BootSupportCheck" + Yast.import "Product" Yast.include self, "bootloader/routines/wizards.rb" end @@ -119,13 +120,24 @@ if ["grub2", "grub2-efi"].include? old_bootloader log.info "update of grub2, do not repropose" if !Yast::BootCommon.was_read || force_reset + # SCR isn't pointing to /mnt yet but we'd really like to read + # the config files - so we're cheating a bit. + Yast::WFM.Execute(Path.new(".local.bash"), + "ln -s /mnt/boot/grub2 /boot; " \ + "ln -s /mnt/etc/default/grub{,_installdevice} /etc/default; " \ + "ln -s /mnt/etc/sysconfig/bootloader /etc/sysconfig" + ) Yast::Bootloader.blRead(true, true) Yast::BootCommon.was_read = true + # update the product name + prod = Yast::Product.short_name + Yast::BootCommon.globals["distributor"] = prod + log.info "grub2 menu entry = #{prod}" end elsif old_bootloader == "none" log.info "Bootloader not configured, do not repropose" # blRead just exits for none bootloader - BootCommon.was_read = true + Yast::BootCommon.was_read = true elsif !Yast::BootCommon.was_proposed || force_reset # Repropose the type. A regular Reset/Propose is not enough. # For more details see bnc#872081 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.139/test/bootloader_proposal_client_test.rb new/yast2-bootloader-3.1.140/test/bootloader_proposal_client_test.rb --- old/yast2-bootloader-3.1.139/test/bootloader_proposal_client_test.rb 2015-08-05 15:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.140/test/bootloader_proposal_client_test.rb 2015-08-14 15:37:08.000000000 +0200 @@ -174,6 +174,7 @@ expect(Yast::Bootloader).to_not receive(:Propose) expect(Yast::Bootloader).to receive(:blRead) + expect(Yast::Product).to receive(:short_name).and_return("SLES") subject.make_proposal({}) end
