From 8f825a91c97b0da9ee6ec989689ef5be9e2dd8fa Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 9 Feb 2016 03:25:34 +0000 Subject: [PATCH] * Correct initrd.img symlink, kernel/hooks should actually produce the right thing here, but meh. * Chroot to execute zipl, fails to boot otherwise. --- debian/changelog | 3 +++ live-build/ubuntu-cpc/hooks/032-disk-image.binary | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8d03b7f..e35f6710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,9 @@ livecd-rootfs (2.376ubuntu1) UNRELEASED; urgency=medium [ Dimitri John Ledkov ] * Do not remove linux-base, when purging all the linux-*, in the tarball build. Otherwise ubuntu-minimal is removed, and things get crazy. + * Correct initrd.img symlink, kernel/hooks should actually produce the + right thing here, but meh. + * Chroot to execute zipl, fails to boot otherwise. -- Ben Howard Sun, 07 Feb 2016 16:59:41 -0700 diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary index 1c7f71c2..f9fee4b1 100755 --- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary +++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary @@ -106,12 +106,18 @@ ramdisk = /boot/initrd.img parameters = root=LABEL=cloudimg-rootfs EOF + # Kernel initramfs hooks end up creating a copy + # rather than a symlink FIXME + pushd mountpoint/boot + ln -sf initrd.img-* initrd.img + popd + # Create bootmap file - mountpoint/sbin/zipl -V \ - --image=mountpoint/boot/vmlinuz \ - --ramdisk=mountpoint/boot/initrd.img \ + chroot mountpoint /sbin/zipl -V \ + --image=/boot/vmlinuz \ + --ramdisk=/boot/initrd.img \ --parameters='root=LABEL=cloudimg-rootfs' \ - --target=mountpoint/boot/ \ + --target=/boot/ \ --targetbase=/dev/loop0 \ --targettype=SCSI \ --targetblocksize=512 \