diff --git a/debian/changelog b/debian/changelog index 63a4ad22..214160d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.32) UNRELEASED; urgency=medium + + * Make the hybrid canary images the default for Ubuntu. + + -- Ɓukasz 'sil2100' Zemczak Tue, 06 Sep 2023 18:21:34 +0200 + livecd-rootfs (23.10.31) mantic; urgency=medium * blkid is unreliable in mount_image(), but this blkid call is only here diff --git a/live-build/auto/config b/live-build/auto/config index 13eb7b45..374387b3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -721,7 +721,7 @@ case $PROJECT in ;; esac ;; - canary) + *) touch config/universe-enabled PASSES_TO_LAYERS="true" KERNEL_FLAVOURS='generic-hwe-22.04' @@ -765,32 +765,6 @@ case $PROJECT in /usr/share/livecd-rootfs/checkout-translations-branch \ https://git.launchpad.net/subiquity po config/catalog-translations ;; - *) - touch config/universe-enabled - PASSES_TO_LAYERS="true" - KERNEL_FLAVOURS='generic-hwe-22.04' - add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages - add_task standard.live ubuntu-live - add_package standard cloud-init - remove_package standard.live ubiquity-frontend-gtk - add_snap standard.live ubuntu-desktop-installer/classic - - seeded_langs="$(get_seeded_languages desktop)" - echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages - derive_language_layers standard desktop desktop-default-languages "$seeded_langs" - cat <<-EOF > config/standard.catalog-in.yaml - name: "Ubuntu Desktop" - description: >- - Ubuntu Desktop. - id: ubuntu-desktop - type: fsimage-layered - variant: desktop - locale_support: langpack - default: yes - EOF - /usr/share/livecd-rootfs/checkout-translations-branch \ - https://git.launchpad.net/subiquity po config/catalog-translations - ;; esac ;; @@ -1552,7 +1526,7 @@ EOF ;; ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \ - ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:canary|ubuntu-oem:*) + ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*) # Ensure that most things e.g. includes.chroot are copied as is for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do case $entry in 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 781419cf..2235f65f 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 @@ -10,8 +10,8 @@ case $ARCH in esac case ${PROJECT:-}:${SUBPROJECT:-} in - *:canary) - echo "We don't create EFI images for canary." + ubuntu:) + echo "We don't create EFI images for Ubuntu Desktop." exit 0 ;; ubuntu) diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary similarity index 95% rename from live-build/ubuntu/hooks/020-canary-enhanced-sb.binary rename to live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary index cb86e471..e7fb9a35 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary @@ -10,14 +10,10 @@ case ${PASS:-} in ;; esac -case ${SUBPROJECT:-} in - canary) - ;; - *) - echo "We don't run canary hooks for this project." - exit 0 - ;; -esac +if [ -n "${SUBPROJECT:-}" ]; then + echo "We don't run Ubuntu Desktop hooks for this project." + exit 0 +fi . config/binary . config/functions diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early similarity index 100% rename from live-build/ubuntu/hooks/020-canary-live.chroot_early rename to live-build/ubuntu/hooks/020-ubuntu-live.chroot_early diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary index b27114ab..1e7bc461 100644 --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary @@ -3,7 +3,7 @@ echo "Creating Hyper-V image with Desktop..." case ${SUBPROJECT:-} in - minimized|canary) + minimized|"") echo "We don't create minimized images for $0." exit 0 ;;