[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
> @@ -149,7 +149,7 @@ create_partitions() {
>                          --change-name=15:ESP \
>                          --new=1:253952: \
>                          --attributes=1:set:2
> -            else
> +            elif [ "${SUBARCH:-}" = "sifive_unmatched" ]; then

This is not the correct subarch name for unmatched tho

>                  # preinstalled server, currently FU540
>                  # FU740 too in the future
>                  sgdisk "${disk_image}" \


-- 
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.