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

Import patches-unapplied version 2.484 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 0714b6b801f91a24da570fc572dbe296bf9c41f0

New changelog entries:
  [ Balint Reczey ]
  * Skip setting up initrd for s390x when it is not generated for the image.
    This fixes building minimized s390x images.
This commit is contained in:
Steve Langasek 2017-11-14 16:58:34 -08:00 committed by usd-importer
parent 0714b6b801
commit 1db37274ff
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.484) bionic; urgency=medium
[ Balint Reczey ]
* Skip setting up initrd for s390x when it is not generated for the image.
This fixes building minimized s390x images.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 14 Nov 2017 16:58:34 -0800
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

13
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
ZIPL_EXTRA_PARAMS=
if [ -e mountpoint/boot/initrd.img-* ]; then
# Kernel initramfs hooks end up creating a copy # Kernel initramfs hooks end up creating a copy
# rather than a symlink FIXME # rather than a symlink FIXME
pushd mountpoint/boot pushd mountpoint/boot
ln -sf initrd.img-* initrd.img ln -sf initrd.img-* initrd.img
popd 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