Imported 23.10.14

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-08-16 17:51:10 +00:00
parent abc9fb0cb3
commit 95f346f873
2 changed files with 15 additions and 14 deletions

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (23.10.14) mantic; urgency=medium
* canary
* fix the install of the classic variation by including dctrl-tools in the
live layer
* fix the layer for the classic variation
* fix language layer generation (LP: #2031027)
* drop minimal install source to match the other desktop image
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 15 Aug 2023 18:05:39 -0600
livecd-rootfs (23.10.13) mantic; urgency=medium livecd-rootfs (23.10.13) mantic; urgency=medium
[ Jess Jang ] [ Jess Jang ]

View File

@ -740,7 +740,7 @@ case $PROJECT in
fi fi
# the live layer, contains all packages for the live session installer # the live layer, contains all packages for the live session installer
# TODO: we should probably add the kernel per KERNEL_FLAVOURS # TODO: we should probably add the kernel per KERNEL_FLAVOURS
add_package minimal.standard.live linux-generic casper lvm2 mdadm cryptsetup add_package minimal.standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools
remove_package minimal.standard.live ubiquity-frontend-gtk remove_package minimal.standard.live ubiquity-frontend-gtk
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
@ -748,20 +748,10 @@ case $PROJECT in
# language support # language support
seeded_langs="$(get_seeded_languages desktop-minimal desktop)" seeded_langs="$(get_seeded_languages desktop-minimal desktop)"
echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" derive_language_layers minimal.standard.classic desktop desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs"
# now let's create the neccessary catalog files # now let's create the neccessary catalog files
# TODO: make sure that we handle locale_support: langpack correctly
cat <<-EOF > config/minimal.catalog-in.yaml
name: "Ubuntu Desktop (minimized)"
description: >-
A minimal but usable Ubuntu Desktop.
id: ubuntu-desktop-minimal
type: fsimage-layered
variant: desktop
locale_support: langpack
EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"
description: >- description: >-
@ -776,7 +766,7 @@ case $PROJECT in
id: ubuntu-desktop id: ubuntu-desktop
variations: variations:
classic: classic:
path: minimal.standard.squashfs path: minimal.standard.classic.squashfs
EOF EOF
cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop id: ubuntu-desktop