[master rhel7] Get crashkernel arguments from the crashkernel code dynamically (#814813)

[Peter Jones <pjones@xxxxxxxxxx>]

Instead of us knowing about crashkernel stuff in our code, let the
crashkernel guys own that policy.

rhcrashkernel-param comes from the following url, though I'm told
they're updating it not to end in .sh there:

http://pkgs.fedoraproject.org/gitweb/?p=kexec-tools.git;a=commitdiff;h=ca94c80a91400e9ce95bb56023ca4391d5b41d85
---
 pyanaconda/bootloader.py          |    5 +++++
 pyanaconda/installclasses/rhel.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index cfbd152..a45ae22 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1631,6 +1631,11 @@ class GRUB2(GRUB):
     stage2_raid_levels = [mdraid.RAID0, mdraid.RAID1, mdraid.RAID4,
                           mdraid.RAID5, mdraid.RAID6, mdraid.RAID10]
 
+    def __init__(self, storage):
+        super(GRUB2, self).__init__(self, storage)
+        self.boot_args.add("$([ -x /usr/sbin/rhcrashkernel-param ] && "\
+                            "/usr/sbin/rhcrashkernel-param)")
+
     # XXX we probably need special handling for raid stage1 w/ gpt disklabel
     #     since it's unlikely there'll be a bios boot partition on each disk
 
diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py
index d894543..f4a2457 100644
--- a/pyanaconda/installclasses/rhel.py
+++ b/pyanaconda/installclasses/rhel.py
@@ -39,7 +39,7 @@ class InstallClass(BaseInstallClass):
     hidden = 1
 
     bootloaderTimeoutDefault = 5
-    bootloaderExtraArgs = ["crashkernel=auto"]
+    bootloaderExtraArgs = []
 
     tasks = [(N_("Minimal"),
               ["core"])]
-- 
1.7.10.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list