Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2018-03-11 18:02:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Sun Mar 11 18:02:11 2018 rev:256 rq:583902 version:4.0.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2018-02-24 16:36:24.891851422 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes
2018-03-11 18:02:13.185483665 +0100
@@ -1,0 +2,8 @@
+Wed Mar 7 13:49:53 UTC 2018 - jreidin...@suse.com
+
+- do not repropose configuration in autoyast confirm mode
+ (bsc#1081967)
+- fix setting pmbr flag in autoyast (bsc#1081967)
+- 4.0.20
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-4.0.19.tar.bz2
New:
----
yast2-bootloader-4.0.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.U9ptWT/_old 2018-03-11 18:02:13.993454700 +0100
+++ /var/tmp/diff_new_pack.U9ptWT/_new 2018-03-11 18:02:13.993454700 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.0.19
+Version: 4.0.20
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-bootloader-4.0.19.tar.bz2 -> yast2-bootloader-4.0.20.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.0.19/package/yast2-bootloader.changes
new/yast2-bootloader-4.0.20/package/yast2-bootloader.changes
--- old/yast2-bootloader-4.0.19/package/yast2-bootloader.changes
2018-02-23 14:08:55.000000000 +0100
+++ new/yast2-bootloader-4.0.20/package/yast2-bootloader.changes
2018-03-07 15:11:36.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Mar 7 13:49:53 UTC 2018 - jreidin...@suse.com
+
+- do not repropose configuration in autoyast confirm mode
+ (bsc#1081967)
+- fix setting pmbr flag in autoyast (bsc#1081967)
+- 4.0.20
+
+-------------------------------------------------------------------
Fri Feb 23 12:15:11 UTC 2018 - igonzalezs...@suse.com
- Remove calls to the old yast2-storage layer (bsc#1071978)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.0.19/package/yast2-bootloader.spec
new/yast2-bootloader-4.0.20/package/yast2-bootloader.spec
--- old/yast2-bootloader-4.0.19/package/yast2-bootloader.spec 2018-02-23
14:08:55.000000000 +0100
+++ new/yast2-bootloader-4.0.20/package/yast2-bootloader.spec 2018-03-07
15:11:36.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 4.0.19
+Version: 4.0.20
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.0.19/src/lib/bootloader/autoyast_converter.rb
new/yast2-bootloader-4.0.20/src/lib/bootloader/autoyast_converter.rb
--- old/yast2-bootloader-4.0.19/src/lib/bootloader/autoyast_converter.rb
2018-02-23 14:08:55.000000000 +0100
+++ new/yast2-bootloader-4.0.20/src/lib/bootloader/autoyast_converter.rb
2018-03-07 15:11:36.000000000 +0100
@@ -34,6 +34,9 @@
import_stage1(data, bootloader)
import_default(data, bootloader.grub_default)
import_device_map(data, bootloader)
+ # always nil pmbr as autoyast does not support it yet,
+ # so use nil to always use proposed value (bsc#1081967)
+ bootloader.pmbr_action = nil
# TODO: import Initrd
log.warn "autoyast profile contain sections which won't be processed"
if data["sections"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.0.19/src/lib/bootloader/grub2.rb
new/yast2-bootloader-4.0.20/src/lib/bootloader/grub2.rb
--- old/yast2-bootloader-4.0.19/src/lib/bootloader/grub2.rb 2018-02-23
14:08:55.000000000 +0100
+++ new/yast2-bootloader-4.0.20/src/lib/bootloader/grub2.rb 2018-03-07
15:11:36.000000000 +0100
@@ -80,6 +80,8 @@
# for GPT add protective MBR flag otherwise some systems won't
# boot, safer option for legacy booting (bnc#872054)
self.pmbr_action = :add if Yast::BootStorage.gpt_boot_disk?
+ log.info "proposed pmbr_action #{pmbr_action}. " \
+ "gpt boot disk? #{Yast::BootStorage.gpt_boot_disk?}"
device_map.propose if Yast::Arch.x86_64 || Yast::Arch.i386
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-bootloader-4.0.19/src/lib/bootloader/grub2base.rb
new/yast2-bootloader-4.0.20/src/lib/bootloader/grub2base.rb
--- old/yast2-bootloader-4.0.19/src/lib/bootloader/grub2base.rb 2018-02-23
14:08:55.000000000 +0100
+++ new/yast2-bootloader-4.0.20/src/lib/bootloader/grub2base.rb 2018-03-07
15:11:36.000000000 +0100
@@ -180,6 +180,7 @@
end
def merge_pmbr_action(other)
+ log.info "merging pmbr action. own #{@pmbr_action}, other
#{other.pmbr_action}"
@pmbr_action = other.pmbr_action if other.pmbr_action
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-4.0.19/src/modules/Bootloader.rb
new/yast2-bootloader-4.0.20/src/modules/Bootloader.rb
--- old/yast2-bootloader-4.0.19/src/modules/Bootloader.rb 2018-02-23
14:08:55.000000000 +0100
+++ new/yast2-bootloader-4.0.20/src/modules/Bootloader.rb 2018-03-07
15:11:36.000000000 +0100
@@ -91,6 +91,9 @@
end
factory.current = proposed_configuration
+ # mark that it is not clear proposal (bsc#1081967)
+ Yast::Bootloader.proposed_cfg_changed = true
+
true
end
