d9c23d1bce
fedup is deprecated and abandoned. Let's save time and disk by not
building `upgrade.img` when nothing is going to use it anymore.
For the record, performing upgrades using an initramfs from the new
system turns out to be fragile and hard to support:
* dracut initramfs isn't generic enough to handle booting all systems
(e.g. missing vconsole.conf means you get keymaps wrong, so users
can't unlock encrypted disks)
* The ABI differences between the two versions of plymouth, systemd,
etc. requires nasty workarounds at best and causes nightmarish
systemd crashes at worst
This patch removes all the code that built and installed `upgrade.img`.
For backwards compatibility, the API retains the `doupgrade` keyword
argument, and the `--noupgrade` flag is still accepted.
(cherry picked from commit a3e1a275ff)
93 lines
3.3 KiB
Cheetah
93 lines
3.3 KiB
Cheetah
<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product, isolabel"/>
|
|
<%
|
|
configdir="tmp/config_files/ppc"
|
|
BOOTDIR="ppc"
|
|
GRUBDIR="boot/grub"
|
|
STAGE2IMG="images/install.img"
|
|
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 images
|
|
install ${runtime_img} ${STAGE2IMG}
|
|
treeinfo stage2 mainimage ${STAGE2IMG}
|
|
|
|
## 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
|
|
|
|
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} \
|
|
${STAGE2IMG}=${outroot}/${STAGE2IMG} ${imggraft}
|
|
|
|
%for kernel in kernels:
|
|
treeinfo images-${kernel.arch} boot.iso images/boot.iso
|
|
%endfor
|