[Merge] ~xypron/livecd-rootfs:generic into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
> index 781419c..3ba73eb 100755
> --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
> +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
> @@ -168,6 +168,17 @@ create_partitions() {
>                         --change-name=12:CIDATA \
>                         --new=1:: \
>                         --attributes=1:set:2
> +            else
> +                # generic image leaving 8 MiB unused for adding firmware
> +                sgdisk "${disk_image}" \
> +                       --new=12:16384:24575 \
> +                       --change-name=12:CIDATA \
> +                       --new=15:24576:229375 \

elsewhere in this file, these sizes are written as "+<nn>M" which is a lot clearer than writing these large numbers

> +                       --change-name=15:ESP \
> +                       --typecode=15:ef00 \
> +                       --new=1:229376: \
> +                       --change-name=1:root \
> +                       --attributes=1:set:2
>              fi
>              ;;
>          amd64)


-- 
https://code.launchpad.net/~xypron/livecd-rootfs/+git/livecd-rootfs/+merge/449486
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.