From db95ae35e8044d65773592b4cd10659c9af437ad Mon Sep 17 00:00:00 2001 From: Dave Young Date: Fri, 21 Sep 2012 17:15:33 +0800 Subject: [PATCH] Update to support f18 grub2 efi config file F18 switch to use grub2 for efi booting, add the config files to bootloaders array. Tested with F18 alpha. Signed-off-by: Dave Young Acked-by: Vivek Goyal --- firstboot_kdump.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/firstboot_kdump.py b/firstboot_kdump.py index 85ed868..54a5ab7 100755 --- a/firstboot_kdump.py +++ b/firstboot_kdump.py @@ -55,12 +55,14 @@ class moduleClass(Module): reboot = False # possible bootloaders we'll need to adjust - # todo: f18 grub2 for efi # bootloader : (config file, kdump offset) - bootloaders = { "grub" : (["/boot/grub/grub.conf", "/boot/efi/EFI/redhat/grub.conf"], [16, 256]), - "grub2" : (["/boot/grub2/grub.cfg"], [16, 256]), - "zipl" : (["/etc/zipl.conf"], [0]), - "yaboot" : (["/boot/etc/yaboot.conf"], [32]) } + bootloaders = { "grub" : (["/boot/grub/grub.conf", \ + "/boot/efi/EFI/redhat/grub.conf"], [16, 256]),\ + "grub2" : (["/boot/grub2/grub.cfg", \ + "/boot/efi/EFI/fedora/grub.cfg", \ + "/boot/efi/EFI/redhat/grub.cfg"], [16, 256]),\ + "zipl" : (["/etc/zipl.conf"], [0]),\ + "yaboot" : (["/boot/etc/yaboot.conf"], [32]) } bootloader = None offset = 0