Merge lp:~rbalint/livecd-rootfs/s390x-skip-missing-initrd-artful into lp:~ubuntu-core-dev/livecd-rootfs/artful-proposed

[Balint Reczey]

Skip setting up initrd for s390x when it is not generated for the image.
This fixes building minimized s390x images.

I could not test the change, please someone with s390x access give it a try.

[Steve Langasek (vorlon)]

minimized images are generally not useful on artful because we lack kernels there to support initramfsless boot on most targets. s390x might be an exception because there's low variety in the systems and everything should be built into the kernel, but I'm not sure why this would be worth SRUing to a non-LTS release?

review: Needs Information

[Balint Reczey (rbalint)]

On Wed, Feb 7, 2018 at 8:35 AM, Steve Langasek
<email address hidden> wrote:
> Review: Needs Information
>
> minimized images are generally not useful on artful because we lack kernels there to support initramfsless boot on most targets. s390x might be an exception because there's low variety in the systems and everything should be built into the kernel, but I'm not sure why this would be worth SRUing to a non-LTS release?

I'm getting emails about minimized Artful build failures, thus IMO we
should either fix the build or stop trying building this image.
I agree that this non-LTS release may not worth fixing now and I'm OK
with just stop trying building.

[Steve Langasek (vorlon)]

+1 for killing whatever is currently trying to build minimal artful images.

review: Disapprove

Unmerged revisions

1575. By Balint Reczey on 2018-02-06

Update changelog

1574. By Balint Reczey on 2018-02-06

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

This fixes building minimized s390x images.

=== modified file 'debian/changelog'
--- debian/changelog	2017-11-08 19:29:43 +0000
+++ debian/changelog	2018-02-06 20:18:56 +0000
@@ -1,3 +1,10 @@
+livecd-rootfs (2.478.2) 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 <[e-mail]>  Wed, 07 Feb 2018 03:15:16 +0700
+
 livecd-rootfs (2.478.1) artful; urgency=medium
 
   [ Gary Wang ]

=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
--- live-build/ubuntu-cpc/hooks/032-disk-image.binary	2017-10-05 05:51:30 +0000
+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary	2018-02-06 20:18:56 +0000
@@ -144,27 +144,32 @@
 [ubuntu]
 target = /boot
 image = /boot/vmlinuz
-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
-    
+    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