Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-31 12:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip setting up initrd for s390x when it is not generated for the image

Browse Source 
This fixes building minimized s390x images.
This commit is contained in:
Balint Reczey 2017-11-14 18:44:06 +01:00
parent 2bab8488c1
commit 4a168af954
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -144,27 +144,32 @@ default=ubuntu
[ubuntu] [ubuntu]
target = /boot target = /boot
image = /boot/vmlinuz image = /boot/vmlinuz
ramdisk = /boot/initrd.img
parameters = root=LABEL=cloudimg-rootfs parameters = root=LABEL=cloudimg-rootfs
EOF EOF
# Kernel initramfs hooks end up creating a copy ZIPL_EXTRA_PARAMS=
# rather than a symlink FIXME if [ -e mountpoint/boot/initrd.img-* ]; then
pushd mountpoint/boot # Kernel initramfs hooks end up creating a copy
ln -sf initrd.img-* initrd.img # rather than a symlink FIXME
popd pushd mountpoint/boot
ln -sf initrd.img-* initrd.img
popd
ZIPL_EXTRA_PARAMS=--ramdisk=/boot/initrd.img
echo "ramdisk = /boot/initrd.img" >> mountpoint/etc/zipl.conf
fi
# Create bootmap file # Create bootmap file
chroot mountpoint /sbin/zipl -V \ chroot mountpoint /sbin/zipl -V \
--image=/boot/vmlinuz \ --image=/boot/vmlinuz \
--ramdisk=/boot/initrd.img \
--parameters='root=LABEL=cloudimg-rootfs' \ --parameters='root=LABEL=cloudimg-rootfs' \
--target=/boot/ \ --target=/boot/ \
--targetbase=$loop_device \ --targetbase=$loop_device \
--targettype=SCSI \ --targettype=SCSI \
--targetblocksize=512 \ --targetblocksize=512 \
--targetoffset=2048 --targetoffset=2048 \
$ZIPL_EXTRA_PARAMS
fi fi
if [ -n "$BOOT_MOUNTPOINT" ]; then if [ -n "$BOOT_MOUNTPOINT" ]; then