[Merge] ~codyshepherd/livecd-rootfs/+git/livecd-rootfs:buildd-bootable/xenial into livecd-rootfs:ubuntu/xenial

[Dimitri John Ledkov]

Some minor comments / questions, see inline.

Diff comments:

> diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
> new file mode 100755
> index 0000000..4339abe
> --- /dev/null
> +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary
> @@ -0,0 +1,162 @@
> +#!/bin/bash -eux
> +
> +case $ARCH in
> +    amd64)
> +        ;;
> +    *)
> +        echo "We don't create EFI images for $ARCH."
> +        exit 0
> +        ;;
> +esac
> +
> +IMAGE_STR="# BUILDD_IMG: This file was created/modified by the Buildd Image build process"
> +FS_LABEL="buildd-rootfs"
> +
> +. config/binary
> +
> +. config/functions
> +
> +create_partitions() {
> +    disk_image="$1"
> +    sgdisk "${disk_image}" --zap-all
> +    case $ARCH in
> +        arm64)
> +            sgdisk "${disk_image}" \
> +                --new=15:0:204800 \
> +                --typecode=15:ef00 \
> +                --new=1:
> +            ;;
> +        amd64)
> +            sgdisk "${disk_image}" \
> +                --new=14::+4M \
> +                --new=15::+106M \
> +                --new=1::
> +            sgdisk "${disk_image}" \
> +                -t 14:ef02 \
> +                -t 15:ef00
> +            ;;
> +    esac
> +    sgdisk "${disk_image}" \
> +        --print
> +}
> +
> +create_and_mount_uefi_partition() {
> +    uefi_dev="/dev/mapper${loop_device///dev/}p15"
> +    mountpoint="$1"
> +    mkfs.vfat -F 32 -n UEFI "${uefi_dev}"
> +
> +    mkdir -p "${mountpoint}"/boot/efi
> +    mount "${uefi_dev}" "$mountpoint"/boot/efi
> +
> +    cat << EOF >> "mountpoint/etc/fstab"
> +LABEL=UEFI	/boot/efi	vfat	defaults	0 0
> +EOF
> +}
> +
> +install_grub() {
> +    mkdir mountpoint
> +    mount_partition "${rootfs_dev_mapper}" mountpoint
> +
> +    create_and_mount_uefi_partition mountpoint
> +
> +    echo "(hd0) ${loop_device}" > mountpoint/tmp/device.map
> +    mkdir -p mountpoint/etc/default/grub.d
> +    efi_boot_dir="/boot/efi/EFI/BOOT"
> +    chroot mountpoint mkdir -p "${efi_boot_dir}"
> +
> +    #if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
> +    if [ -n "$partuuid" ]; then
> +        echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
> +    fi
> +
> +    chroot mountpoint apt-get -y update
> +
> +    # The modules below only make sense on non-Secure Boot UEFI systems.
> +    # Otherwise, with Secure Boot enabled GRUB will refuse to load them.
> +    # Any modules already in debian/build-efi-images do not need to be listed.
> +    # Furthermore, other modules such as terminal, video_* and efi_* are all
> +    # already available.
> +    case $ARCH in
> +        arm64)
> +            chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin
> +            grub_modules="serial"
> +            efi_target=arm64-efi
> +            ;;
> +        amd64)
> +            chroot mountpoint apt-get install -qqy grub-pc
> +            chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed

it makes sense to install "grub-pc shim-signed" but not the *-efi-* bits explicitly.

> +            grub_modules="multiboot serial usb usb_keyboard"
> +            efi_target=x86_64-efi
> +            ;;
> +    esac
> +
> +    cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
> +${IMAGE_STR}
> +# For Cloud Image compatability
> +GRUB_PRELOAD_MODULES="${GRUB_PRELOAD_MODULES:-$grub_modules}"
> +EOF
> +
> +    # This call to populate the package manifest is added here to capture
> +    # grub-efi packages that otherwise would not make it into the base
> +    # manifest. filesystem.packages is moved into place via symlinking to
> +    # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
> +    create_manifest "mountpoint" "binary/boot/filesystem.packages"
> +
> +    chroot mountpoint grub-install "${loop_device}" \
> +        --boot-directory=/boot \
> +        --efi-directory=/boot/efi \
> +        --target=${efi_target} \
> +        --removable \
> +        --uefi-secure-boot \
> +        --no-nvram \
> +        --modules="${grub_modules}"
> +
> +    if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then
> +        sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg
> +        sed -i "1i${IMAGE_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg
> +        # For some reason the grub disk is looking for /boot/grub/grub.cfg on
> +        # part 15....
> +        chroot mountpoint mkdir -p /boot/efi/boot/grub
> +        chroot mountpoint cp /boot/efi/EFI/BOOT/grub.cfg /boot/efi/boot/grub
> +    fi
> +
> +    if [ "$ARCH" = "amd64" ]; then
> +        # Install the BIOS/GPT bits. Since GPT boots from the ESP partition,
> +        # it means that we just run this simple command and we're done
> +        chroot mountpoint grub-install --target=i386-pc "${loop_device}"
> +    fi
> +
> +    divert_grub mountpoint
> +    chroot mountpoint update-grub
> +    replace_grub_root_with_label mountpoint
> +    undivert_grub mountpoint
> +
> +    chroot mountpoint apt-get -y clean
> +
> +    rm mountpoint/tmp/device.map
> +    umount mountpoint/boot/efi
> +    mount
> +    umount_partition mountpoint
> +    rmdir mountpoint
> +}
> +
> +disk_image=binary/boot/disk-uefi.ext4
> +
> +create_empty_disk_image "${disk_image}"
> +create_partitions "${disk_image}"
> +mount_image "${disk_image}" 1
> +
> +partuuid=$(blkid -s PARTUUID -o value "$rootfs_dev_mapper")
> +
> +# Copy the chroot in to the disk
> +make_ext4_partition "${rootfs_dev_mapper}"
> +mkdir mountpoint
> +mount "${rootfs_dev_mapper}" mountpoint
> +cp -a chroot/* mountpoint/
> +umount mountpoint
> +rmdir mountpoint
> +
> +install_grub
> +
> +clean_loops
> +trap - EXIT
> diff --git a/live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
> new file mode 120000
> index 0000000..bcfcdba
> --- /dev/null
> +++ b/live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
> @@ -0,0 +1 @@
> +/lib/systemd/system/systemd-networkd.socket

The above sets up both systemd-networkd & ifupdown, so which one is going to be used on the image?

I thought you are building xenial images with ifupdown only, thus the systemd-networkd-* units should not be there.

Or nplan should be installed too, if you want systemd-networkd support in addition to ifupdown => but then why is ifupdown installed?

> \ No newline at end of file


-- 
https://code.launchpad.net/~codyshepherd/livecd-rootfs/+git/livecd-rootfs/+merge/378975
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~codyshepherd/livecd-rootfs/+git/livecd-rootfs:buildd-bootable/xenial into livecd-rootfs:ubuntu/xenial.