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

Imported using git-ubuntu import.

Changelog parent: 0714b6b801

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.

debian/changelog

@@ -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
 
   * Fix lingering reference to livecd-rootfs.ubuntu-core.model-assertion

live-build/ubuntu-cpc/hooks/032-disk-image.binary

@@ -144,27 +144,32 @@ default=ubuntu
 [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