Merge lp:~rbalint/livecd-rootfs/s390x-skip-missing-initrd

ubuntu/cosmic
Steve Langasek 7 years ago
commit be29d44c3d

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.484) UNRELEASED; urgency=medium
* Skip setting up initrd for s390x when it is not generated for the image.
This fixes building minimized s390x images.
-- Balint Reczey <rbalint@ubuntu.com> Tue, 14 Nov 2017 18:51:14 +0100
livecd-rootfs (2.483) bionic; urgency=medium
* Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion

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

Loading…
Cancel
Save