Merge remote-tracking branch 'origin/config_files_proto' into jreidin…

…ger_config_files_proto

src/lib/bootloader/grub2.rb

@@ -72,9 +72,9 @@ def propose
       super
 
       stage1.propose
-      # for GPT remove protective MBR flag otherwise some systems won't
-      # boot, safer option for legacy booting
-      self.pmbr_action = :remove if Yast::BootStorage.gpt_boot_disk?
+      # 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?
       device_map.propose if Yast::Arch.x86_64 || Yast::Arch.i386
     end
 

src/lib/bootloader/grub2efi.rb

@@ -52,8 +52,8 @@ def write
     def propose
       super
 
-      # for UEFI always set PMBR flag on disk (bnc#872054)
-      self.pmbr_action = :add
+      # for UEFI always remove PMBR flag on disk (bnc#872054)
+      self.pmbr_action = :remove
 
       @secure_boot = true
     end

test/grub2_efi_test.rb

@@ -63,10 +63,10 @@
       allow(Yast::BootStorage).to receive(:detect_disks)
     end
 
-    it "proposes to add pmbr flag for disk" do
+    it "proposes to remove pmbr flag for disk" do
       subject.propose
 
-      expect(subject.pmbr_action).to eq :add
+      expect(subject.pmbr_action).to eq :remove
     end
 
     it "proposes to use secure boot" do

test/grub2_test.rb

@@ -125,12 +125,12 @@
       subject.propose
     end
 
-    it "propose to remove pmbr flag if boot disk is with gpt label" do
+    it "propose to add pmbr flag if boot disk is with gpt label" do
       allow(Yast::BootStorage).to receive(:gpt_boot_disk?).and_return(true)
 
       subject.propose
 
-      expect(subject.pmbr_action).to eq :remove
+      expect(subject.pmbr_action).to eq :add
     end
 
     it "propose to do not change pmbr flag if boot disk is not with gpt label" do