From 9defb143dafbffd10f0a336f8b0d8eb67a63bdec Mon Sep 17 00:00:00 2001 From: David Ward Date: Mon, 18 Jan 2021 10:49:33 -0500 Subject: [PATCH] live/x86.tmpl: Copy livecd-iso-to-disk script, if installed A post-installation script in fedora-live-base.ks actually modifies Lorax (not idempotently) with the change in this commit while it is running. This modification belongs directly in Lorax instead. Note a subtle distinction in behavior that has been preserved here. Lorax will copy the livecd-iso-to-disk script from the installroot (if present). Running livecd-creator will copy it from the existing root filesystem instead. --- share/templates.d/99-generic/live/x86.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/templates.d/99-generic/live/x86.tmpl b/share/templates.d/99-generic/live/x86.tmpl index a6f2eb69..c1645a85 100644 --- a/share/templates.d/99-generic/live/x86.tmpl +++ b/share/templates.d/99-generic/live/x86.tmpl @@ -112,6 +112,12 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> %endfor +# Add the livecd-iso-to-disk script if installed +<% f = "usr/bin/livecd-iso-to-disk" %> +%if exists(f): + install ${f} ${LIVEDIR}/${f|basename} +%endif + ## make boot.iso runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \ -isohybrid-mbr /usr/share/syslinux/isohdpfx.bin \