From 7f8955e9abf01c3e97e7df549e39e0e200cfd1e6 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 12 Jan 2022 11:25:48 -0800
Subject: [PATCH] Add .discinfo on all arches

It was previously added to s390x and ppc64le, this adds it for aarch64,
ppc, and x86 images.

Resolves: rhbz#2030008
---
 80-rhel/aarch64.tmpl | 1 +
 80-rhel/ppc.tmpl     | 1 +
 80-rhel/x86.tmpl     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/80-rhel/aarch64.tmpl b/80-rhel/aarch64.tmpl
index 600055c..2893a50 100644
--- a/80-rhel/aarch64.tmpl
+++ b/80-rhel/aarch64.tmpl
@@ -78,6 +78,7 @@ mkdir ${KERNELDIR}
 runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
        ${efiargs} -R -J -V '${isolabel}' \
        -graft-points \
+       .discinfo=${outroot}/.discinfo \
        ${KERNELDIR}=${outroot}/${KERNELDIR} \
        ${STAGE2IMG}=${outroot}/${STAGE2IMG} \
        ${efigraft} ${filegraft}
diff --git a/80-rhel/ppc.tmpl b/80-rhel/ppc.tmpl
index 2faf364..b86d020 100644
--- a/80-rhel/ppc.tmpl
+++ b/80-rhel/ppc.tmpl
@@ -107,6 +107,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
         -hfs-volid ${product.version} -hfs-bless ${outroot}/${MACDIR} \
         -map ${inroot}/${configdir}/mapping \
         -no-desktop -allow-multidot ${udfargs} -graft-points \
+        .discinfo=${outroot}/.discinfo \
         ${BOOTDIR}=${outroot}/${BOOTDIR} \
         ${GRUBDIR}=${outroot}/${GRUBDIR} \
         ${STAGE2IMG}=${outroot}/${STAGE2IMG} ${filegraft}
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
index 4bfc1bf..3d9d0a4 100644
--- a/80-rhel/x86.tmpl
+++ b/80-rhel/x86.tmpl
@@ -127,6 +127,7 @@ runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \
        -boot-load-size 4 -boot-info-table -no-emul-boot \
        ${efiargs} -R -J -V '${isolabel}' \
        -graft-points \
+       .discinfo=${outroot}/.discinfo \
        ${STAGE2IMG}=${outroot}/${STAGE2IMG} \
        ${BOOTDIR}=${outroot}/${BOOTDIR} \
        ${KERNELDIR}=${outroot}/${KERNELDIR} \