[RHEL 7.2 - PATCH] Disable GRUB os_prober on POWER (#1193281)

[Robert Marshall]

The GRUB2 os_prober utility searches for other Linux installations
and the output to the grub config file is parsed incorrectly by
petitboot. This disables the os_prober script on the following
POWER based machine/platform combinations.

CHRP/pSeries
        CHRP IBM/pSeries
        pSeries/pSeries
        Maple/pSeries,
        Cell/pSeries
        Momentum/pSeries
        PowerNV/pSeries

Resolves: rhbz#1193281
---
 pyanaconda/bootloader.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 510ab07..877a975 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2067,6 +2067,12 @@ class IPSeriesGRUB2(GRUB2):
         defaults = open(defaults_file, "a+")
         # The terminfo's X and Y size, and output location could change in the future
         defaults.write("GRUB_TERMINFO="terminfo -g 80x24 console"\n")
+        # Disable OS Prober on pSeries systems
+        # TODO: This will disable across all POWER platforms. Need to get
+        #       into blivet and rework how it segments the POWER systems
+        #       to allow for differentiation between PowerNV and
+        #       PowerVM / POWER on qemu/kvm
+        defaults.write("GRUB_DISABLE_OS_PROBER=true\n")
         defaults.close()

[Brian C. Lane]

On Tue, Jul 07, 2015 at 04:27:00PM -0400, Robert Marshall wrote:
> The GRUB2 os_prober utility searches for other Linux installations
> and the output to the grub config file is parsed incorrectly by
> petitboot. This disables the os_prober script on the following
> POWER based machine/platform combinations.
>     CHRP/pSeries
>     CHRP IBM/pSeries
>     pSeries/pSeries
>     Maple/pSeries,
>     Cell/pSeries
>     Momentum/pSeries
>     PowerNV/pSeries
>
> Resolves: rhbz#1193281
>
> pyanaconda/bootloader.py | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 510ab07..877a975 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -2067,6 +2067,12 @@ class IPSeriesGRUB2(GRUB2):
>          defaults = open(defaults_file, "a+")
>          # The terminfo's X and Y size, and output location could change in the future
>          defaults.write("GRUB_TERMINFO="terminfo -g 80x24 console"\n")
>    # Disable OS Prober on pSeries systems
>    # TODO: This will disable across all POWER platforms. Need to get
>    #       into blivet and rework how it segments the POWER systems
>    #       to allow for differentiation between PowerNV and
>    #       PowerVM / POWER on qemu/kvm
>    defaults.write("GRUB_DISABLE_OS_PROBER=true\n")
>    defaults.close()
>
>
> -- 
> 1.8.3.1

Looks good to me.