particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/coreos.live-artifacts: fix kernel and initrd paths in s390x ISO

Browse source 
The `generic.ins` template uses:
  images/kernel.img
  images/initrd.img

However, kernel and initrd are currently stored as:
  images/pxeboot/vmlinuz
  images/pxeboot/initrd.img

This change ensures correct paths are used.
This commit is contained in:
Nikita Dubrovskii 2025-04-17 14:25:09 +02:00 • committed by Simon de Vlieger
parent e294f38d9c
commit 73e3544e86
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
stages/org.osbuild.coreos.live-artifacts.mono
View file

@ -247,7 +247,14 @@ def genisoargs_s390x(paths, test_fixture, volid, name_version):
with open(os.path.join(lorax_templates, 'generic.ins'), 'r', encoding='utf8') as fp1:
with open(os.path.join(paths["iso"], 'generic.ins'), 'w', encoding='utf8') as fp2:
for line in fp1:
fp2.write(line.replace('@INITRD_LOAD_ADDRESS@', INITRD_ADDRESS))
# The paths to the kernel and initrd on our ISO differ slightly from those in generic.ins.
# https://github.com/coreos/coreos-assembler/commit/6f533ef55ee5cf2b10ad97df51eb2d190b6b2c2b
# Let's update the paths in the template to the correct locations.
line = line.replace('images/kernel.img', "images/pxeboot/vmlinuz")
line = line.replace('images/initrd.img', "images/pxeboot/initrd.img")
# Also replace the initrd address in the template with actual value.
line = line.replace('@INITRD_LOAD_ADDRESS@', INITRD_ADDRESS)
fp2.write(line)
for prmfile in [paths["iso/images/cdboot.prm"],
paths["iso/images/generic.prm"],
paths["iso/images/genericdvd.prm"]]: