Skip to content
  • Konrad Rzeszutek Wilk's avatar
    Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64 · a8e0f1ad
    Konrad Rzeszutek Wilk authored
    Commit d33045ce
    
     introduced
    the support for this, but it does not work under x86 (as it stops
    20_linux_xen from running).
    
    The 20_linux_xen is run under a shell and any exits from within it:
    
    (For example on x86):
    + /usr/bin/grub2-file --is-arm64-efi /boot/xen-4.9.0.gz
    [root@tst063 grub]# echo $?
    1
    
    will result in 20_linux_xen exiting without continuing
    and also causing grub2-mkconfig to stop processing.
    
    As in:
    
     [root@tst063 grub]# ./grub-mkconfig | tail
     Generating grub configuration file ...
     Found linux image: /boot/vmlinuz-4.13.0-0.rc5.git1.1.fc27.x86_64
     Found initrd image: /boot/initramfs-4.13.0-0.rc5.git1.1.fc27.x86_64.img
     Found linux image: /boot/vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2
     Found initrd image: /boot/initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img
     		echo	'Loading Linux 0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 ...'
     		linux	/vmlinuz-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2 root=/dev/mapper/fedora_tst063-root ro single
     		echo	'Loading initial ramdisk ...'
     		initrd	/initramfs-0-rescue-ec082ee24aea41b9b16aca52a6d10cc2.img
     	}
     }
    
     ### END /usr/local/etc/grub.d/10_linux ###
    
     ### BEGIN /usr/local/etc/grub.d/20_linux_xen ###
    
     root@tst063 grub]#
    
    And no more.
    
    This patch wraps the invocation of grub-file to be a in subshell
    and to process the return value in a conditional. That fixes
    the issue.
    
    RH-BZ 1486002: grub2-mkconfig does not work if xen.gz is installed.
    
    CC: Fu Wei <fu.wei@linaro.org>
    Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Reviewed-by: default avatarDaniel Kiper <daniel.kiper@oracle.com>
    a8e0f1ad