s390x firstboot fix

Resolves: bz805782

1. remove s390x from unsupported archs
2. add s390x bootloader handling

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Dave Young 2012-08-09 10:22:50 +08:00
parent ea29dbf667
commit 4b061633b3

View File

@ -59,12 +59,13 @@ class moduleClass(Module):
# bootloader : (config file, kdump offset) # bootloader : (config file, kdump offset)
bootloaders = { "grub" : (["/boot/grub/grub.conf", "/boot/efi/EFI/redhat/grub.conf"], [16, 256]), bootloaders = { "grub" : (["/boot/grub/grub.conf", "/boot/efi/EFI/redhat/grub.conf"], [16, 256]),
"grub2" : (["/boot/grub2/grub.cfg"], [16, 256]), "grub2" : (["/boot/grub2/grub.cfg"], [16, 256]),
"zipl" : (["/etc/zipl.conf"], [0]),
"yaboot" : (["/boot/etc/yaboot.conf"], [32]) } "yaboot" : (["/boot/etc/yaboot.conf"], [32]) }
bootloader = None bootloader = None
offset = 0 offset = 0
# list of architectures without kdump support # list of architectures without kdump support
unsupportedArches = [ "ppc", "s390", "s390x", "i386", "i586" ] unsupportedArches = [ "ppc", "s390", "i386", "i586" ]
# list of platforms that have a separate kernel-kdump # list of platforms that have a separate kernel-kdump
kernelKdumpArches = [ "ppc64" ] kernelKdumpArches = [ "ppc64" ]
@ -408,6 +409,8 @@ class moduleClass(Module):
os.system("/bin/systemctl %s kdump.service" % (chkconfigStatus)) os.system("/bin/systemctl %s kdump.service" % (chkconfigStatus))
if self.bootloader == 'yaboot': if self.bootloader == 'yaboot':
os.system('/sbin/ybin') os.system('/sbin/ybin')
if self.bootloader == 'zipl':
os.system('/sbin/zipl')
else: else:
self.reboot = False self.reboot = False