5155ff65ac
I originally added --add-template to support doing something similar
to pungi, which injects content into the system to be used by default.
However, this causes the content to be part of the squashfs, which
means PXE installations have to download significantly more data that
they may not need (if they actually want to pull the tree data from
the network, which is not an unusual case).
What I actually need is to be able to modify *both* the runtime image
and the arch-specific content. For the runtime, I need to change
/usr/share/anaconda/interactive-defaults.ks to point to the new
content. (Although, potentially we could patch Anaconda itself to
auto-detect an ostree repository configured in disk image, similar to
what it does for yum repositories)
For the arch-specfic image, I want to drop my content into the ISO
root.
So this patch adds --add-arch-template and --add-arch-template-var
in order to do the latter, while preserving the --add-template
to affect the runtime image.
Further, the templates will automatically graft in a directory named
"iso-graft/" from the working directory (if it exists).
(I suggest that external templates create a subdirectory named
"content" to avoid clashes with any future lorax work)
Thus, this will be used by the Atomic Host lorax templates to inject
content/repo, but could be used by e.g. pungi to add content/rpms as
well.
I tried to avoid code deduplication by creating a new template for the
product.img bits and this, but that broke because the parent boot.iso
code needs access to the `${imggraft}` variable. I think a real fix
here would involve turning the product.img, content/, *and* boot.iso
into a new template.
Conflicts:
src/sbin/lorax
98 lines
3.4 KiB
Cheetah
98 lines
3.4 KiB
Cheetah
<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product, isolabel"/>
|
|
<%
|
|
configdir="tmp/config_files/ppc"
|
|
BOOTDIR="ppc"
|
|
GRUBDIR="boot/grub"
|
|
LIVEDIR="LiveOS"
|
|
LORAXDIR="usr/share/lorax/"
|
|
|
|
## NOTE: yaboot freaks out and stops parsing its config if it sees a '\',
|
|
## so we can't use the udev escape sequences in the root arg.
|
|
## Instead we'll just replace any non-ASCII characters in the isolabel
|
|
## with '_', which means we won't need any udev escapes.
|
|
isolabel = ''.join(ch if ch.isalnum() else '_' for ch in isolabel)
|
|
|
|
## Anaconda finds the CDROM device automatically
|
|
rootarg = ""
|
|
%>
|
|
|
|
mkdir ${LIVEDIR}
|
|
install ${runtime_img} ${LIVEDIR}/squashfs.img
|
|
treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
|
|
|
|
## install the bootloaders
|
|
## ppc/chrp: for normal PPC systems.
|
|
## uses /ppc/bootinfo.txt in the iso root
|
|
## uses /boot/grub/grub.cfg in the iso root
|
|
mkdir ${BOOTDIR}
|
|
## boot stuff for normal (CHRP/PREP) PPC systems
|
|
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/*.mod ${GRUBDIR}/powerpc-ieee1275
|
|
install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275
|
|
|
|
install ${configdir}/grub.cfg.in ${GRUBDIR}/grub.cfg
|
|
replace @PRODUCT@ '${product.name}' ${GRUBDIR}/grub.cfg
|
|
replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg
|
|
replace @ROOT@ "${rootarg}" ${GRUBDIR}/grub.cfg
|
|
|
|
install ${configdir}/mapping ${BOOTDIR}
|
|
|
|
## Install kernel and bootloader config (in separate places for each arch)
|
|
%for kernel in kernels:
|
|
<%
|
|
bits = 64
|
|
## separate dirs/images for each arch
|
|
KERNELDIR=BOOTDIR+"/ppc%s" % bits
|
|
%>
|
|
## install kernel
|
|
mkdir ${KERNELDIR}
|
|
installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz
|
|
installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
|
|
|
|
%if doupgrade:
|
|
## upgrade image
|
|
installupgradeinitrd images-${kernel.arch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
|
|
%endif
|
|
|
|
treeinfo images-${kernel.arch} zimage
|
|
%endfor
|
|
|
|
mkdir images/
|
|
# Create optional product.img and updates.img
|
|
<% imggraft=""; images=["product", "updates"] %>
|
|
%for img in images:
|
|
%if exists("%s/%s/" % (LORAXDIR, img)):
|
|
installimg ${LORAXDIR}/${img}/ images/${img}.img
|
|
<% imggraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %>
|
|
%endif
|
|
%endfor
|
|
|
|
# Inherit iso-graft/ if it exists from external templates
|
|
<%
|
|
import os
|
|
if os.path.exists(workdir + "/iso-graft"):
|
|
imggraft += " " + workdir + "/iso-graft"
|
|
%>
|
|
|
|
## make boot.iso
|
|
runcmd mkisofs -v -U -J -R -T \
|
|
-o ${outroot}/images/boot.iso \
|
|
-part -hfs -r -l -sysid PPC \
|
|
-A "${product.name} ${product.version}" -V '${isolabel}' \
|
|
-volset "${product.version}" -volset-size 1 -volset-seqno 1 \
|
|
-hfs-volid ${product.version} \
|
|
-chrp-boot -map ${inroot}/${configdir}/mapping \
|
|
-no-desktop -allow-multidot -graft-points \
|
|
${BOOTDIR}=${outroot}/${BOOTDIR} \
|
|
${GRUBDIR}=${outroot}/${GRUBDIR} \
|
|
${LIVEDIR}=${outroot}/${LIVEDIR} ${imggraft}
|
|
|
|
%for kernel in kernels:
|
|
treeinfo images-${kernel.arch} boot.iso images/boot.iso
|
|
%endfor
|