From 9f73f60a216eadc5fc7c854165fd6a1a6522f965 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Nov 2022 15:12:54 -0800 Subject: [PATCH] On ppc64le Use core.elf from grub2 package grub2 1:2.06-51 now ships a signed core.elf that includes all the needed modules, use that instead of making an unsigned one. Resolves: rhbz#2143422 --- 80-rhel/live/ppc64le.tmpl | 4 +--- 80-rhel/ppc64le.tmpl | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/80-rhel/live/ppc64le.tmpl b/80-rhel/live/ppc64le.tmpl index 5cd79e0..e8d225f 100644 --- a/80-rhel/live/ppc64le.tmpl +++ b/80-rhel/live/ppc64le.tmpl @@ -36,9 +36,7 @@ mkdir ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR} mkdir ${GRUBDIR}/powerpc-ieee1275 -## "()" means the current device to grub2 -runcmd grub2-mkimage --format=powerpc-ieee1275 --directory=/usr/lib/grub/powerpc-ieee1275 --prefix="()/"${GRUBDIR} \ ---output=${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http +install /usr/lib/grub/powerpc-ieee1275/core.elf ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 diff --git a/80-rhel/ppc64le.tmpl b/80-rhel/ppc64le.tmpl index dc03c09..b3503ca 100644 --- a/80-rhel/ppc64le.tmpl +++ b/80-rhel/ppc64le.tmpl @@ -36,9 +36,7 @@ mkdir ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR} mkdir ${GRUBDIR}/powerpc-ieee1275 -## "()" means the current device to grub2 -runcmd grub2-mkimage --format=powerpc-ieee1275 --directory=/usr/lib/grub/powerpc-ieee1275 --prefix="()/"${GRUBDIR} \ ---output=${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http +install /usr/lib/grub/powerpc-ieee1275/core.elf ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275