Merge remote-tracking branch 'origin/SLE-12-SP3' into sp3_merge2

yast · Mar 7, 2018 · 1788f33 · 1788f33
2 parents e4aca6a + 8ea1ea1
commit 1788f33
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar  7 13:49:53 UTC 2018 - jreidinger@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 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.0.19
+Version:        4.0.20
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/bootloader/autoyast_converter.rb b/src/lib/bootloader/autoyast_converter.rb
@@ -34,6 +34,9 @@ def import(data)
         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 --git a/src/lib/bootloader/grub2.rb b/src/lib/bootloader/grub2.rb
@@ -80,6 +80,8 @@ def propose
       # 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 --git a/src/lib/bootloader/grub2base.rb b/src/lib/bootloader/grub2base.rb
@@ -180,6 +180,7 @@ def systemwide_locale
     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 --git a/src/modules/Bootloader.rb b/src/modules/Bootloader.rb
@@ -91,6 +91,9 @@ def Import(data)
       end
       factory.current = proposed_configuration
 
+      # mark that it is not clear proposal (bsc#1081967)
+      Yast::Bootloader.proposed_cfg_changed = true
+
       true
     end