Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-07-28 06:31:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-23 22:06:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-07-28 06:31:22.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jul 25 16:11:37 UTC 2014 - [email protected] + +- allow change of bootloader proposal during upgrade (bnc#887015) +- 3.1.70 + +------------------------------------------------------------------- +Fri Jul 25 11:48:35 UTC 2014 - [email protected] + +- code de-duplication of recent AUtoYaST fixes (bnc#885634) +- 3.1.69 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.68.tar.bz2 New: ---- yast2-bootloader-3.1.70.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.pt5ReV/_old 2014-07-28 06:31:23.000000000 +0200 +++ /var/tmp/diff_new_pack.pt5ReV/_new 2014-07-28 06:31:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.68 +Version: 3.1.70 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.68.tar.bz2 -> yast2-bootloader-3.1.70.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.68/package/yast2-bootloader.changes new/yast2-bootloader-3.1.70/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.68/package/yast2-bootloader.changes 2014-07-22 13:23:14.000000000 +0200 +++ new/yast2-bootloader-3.1.70/package/yast2-bootloader.changes 2014-07-25 18:53:13.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Jul 25 16:11:37 UTC 2014 - [email protected] + +- allow change of bootloader proposal during upgrade (bnc#887015) +- 3.1.70 + +------------------------------------------------------------------- +Fri Jul 25 11:48:35 UTC 2014 - [email protected] + +- code de-duplication of recent AUtoYaST fixes (bnc#885634) +- 3.1.69 + +------------------------------------------------------------------- Tue Jul 22 09:00:56 UTC 2014 - [email protected] - initialize bootloader location configuration on AutoYaST ugprade diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.68/package/yast2-bootloader.spec new/yast2-bootloader-3.1.70/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.68/package/yast2-bootloader.spec 2014-07-22 13:23:14.000000000 +0200 +++ new/yast2-bootloader-3.1.70/package/yast2-bootloader.spec 2014-07-25 18:53:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.68 +Version: 3.1.70 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.68/src/clients/bootloader_auto.rb new/yast2-bootloader-3.1.70/src/clients/bootloader_auto.rb --- old/yast2-bootloader-3.1.68/src/clients/bootloader_auto.rb 2014-07-22 13:23:14.000000000 +0200 +++ new/yast2-bootloader-3.1.70/src/clients/bootloader_auto.rb 2014-07-25 18:53:13.000000000 +0200 @@ -55,6 +55,13 @@ data = AI2Export(@param) if data @ret = Bootloader.Import(data) + # moved here from inst_autosetup* + if Stage.initial + BootCommon.DetectDisks + Builtins.y2debug("autoyast: Proposing - fix") + Bootloader.Propose + Builtins.y2debug("autoyast: Proposing done") + end else @ret = false end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.68/src/clients/bootloader_proposal.rb new/yast2-bootloader-3.1.70/src/clients/bootloader_proposal.rb --- old/yast2-bootloader-3.1.68/src/clients/bootloader_proposal.rb 2014-07-22 13:23:14.000000000 +0200 +++ new/yast2-bootloader-3.1.70/src/clients/bootloader_proposal.rb 2014-07-25 18:53:13.000000000 +0200 @@ -57,11 +57,19 @@ if Mode.update if ["grub2", "grub2-efi"].include? old_bootloader Builtins.y2milestone "update of grub2, do not repropose" - Bootloader.blRead(true, true) + if !BootCommon.was_read || @force_reset + # blRead(reread, avoid_reading_device_map) + Bootloader.blRead(true, true) + BootCommon.was_read = true + end else - BootCommon.setLoaderType(nil) - Bootloader.Reset - Bootloader.Propose + if !BootCommon.was_proposed || @force_reset + # Repropose the type. A regular Reset/Propose is not enough. + # For more details see bnc#872081 + BootCommon.setLoaderType(nil) + Bootloader.Reset + Bootloader.Propose + end end else # in installation always propose missing stuff -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
