Skip to content

Commit

Permalink
Avoid configuration where to MBR we want grub2 and also generic_mbr (…
Browse files Browse the repository at this point in the history
…bnc#893626)
  • Loading branch information
jreidinger committed Sep 8, 2014
1 parent 9e787bd commit bfaf896
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/include/bootloader/grub2/misc.rb
Expand Up @@ -528,6 +528,8 @@ def SetBootloaderDevice(selected_location)
Ops.set(BootCommon.globals, "boot_boot", "true")
elsif selected_location == :mbr
Ops.set(BootCommon.globals, "boot_mbr", "true")
# Disable generic MBR as we want grub2 there
Ops.set(BootCommon.globals, "generic_mbr", "false")
elsif selected_location == :extended
Ops.set(BootCommon.globals, "boot_extended", "true")
end
Expand Down Expand Up @@ -759,6 +761,8 @@ def grub_ConfigureLocation
BootCommon.pmbr_action = :remove
end

Builtins.y2milestone("location configured. Resulting globals #{BootCommon.globals}")

selected_location
end

Expand Down

0 comments on commit bfaf896

Please sign in to comment.