Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-28 19:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve Langasek 2017-11-14 13:01:27 -08:00
commit be29d44c3d
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 livecd-rootfs (2.483) bionic; urgency=medium
* Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion * Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion

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
echo "ramdisk = /boot/initrd.img" >> mountpoint/etc/zipl.conf
ZIPL_EXTRA_PARAMS=--ramdisk=/boot/initrd.img
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