Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-14 18:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 23.10.35 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-09-12 17:51:11 +00:00
parent 91d584795a
commit 18f51b8130
2 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (23.10.35) mantic; urgency=medium
* Restore a desktop minimal layer and use if by default (ffe lp: #2034261)
-- Sebastien Bacher <seb128@ubuntu.com> Tue, 12 Sep 2023 13:12:16 +0200
livecd-rootfs (23.10.34) mantic; urgency=medium livecd-rootfs (23.10.34) mantic; urgency=medium
[ Steve Langasek ] [ Steve Langasek ]

64
live-build/auto/config
View File

@ -716,25 +716,38 @@ case $PROJECT in
*) *)
touch config/universe-enabled touch config/universe-enabled
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
# the minimal layer, for minimal installs
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
add_package minimal cloud-init
# the standard layer, contains all base common packages for later layers # the standard layer, contains all base common packages for later layers
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
add_package standard cloud-init
# the live layer, contains all packages for the live session installer # the live layer, contains all packages for the live session installer
add_task standard.live ubuntu-live add_task minimal.standard.live ubuntu-live
remove_package standard.live ubiquity-frontend-gtk remove_package minimal.standard.live ubiquity-frontend-gtk
add_snap standard.live ubuntu-desktop-installer/classic add_snap minimal.standard.live ubuntu-desktop-installer/classic
add_package standard.live linux-generic-hwe-22.04 casper add_package minimal.standard.live linux-generic-hwe-22.04 casper
# 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 standard.enhanced-secureboot cryptsetup boot-managed-by-snapd add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
# language support # language support
seeded_langs="$(get_seeded_languages desktop)" seeded_langs="$(get_seeded_languages desktop)"
echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
derive_language_layers standard desktop desktop-default-languages "$seeded_langs" derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs"
derive_language_layers standard.enhanced-secureboot 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
cat <<-EOF > config/standard.catalog-in.yaml 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
default: yes
variant: desktop
locale_support: langpack
EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"
description: >- description: >-
A full featured Ubuntu Desktop. A full featured Ubuntu Desktop.
@ -742,16 +755,15 @@ case $PROJECT in
type: fsimage-layered type: fsimage-layered
variant: desktop variant: desktop
locale_support: langpack locale_support: langpack
default: yes
variations: variations:
standard: standard:
path: standard.squashfs path: minimal.standard.squashfs
EOF EOF
cat <<-EOF > config/standard.enhanced-secureboot.catalog-in.yaml cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop id: ubuntu-desktop
variations: variations:
enhanced-secureboot: enhanced-secureboot:
path: standard.enhanced-secureboot.squashfs path: minimal.standard.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop snapd_system_label: enhanced-secureboot-desktop
EOF EOF
/usr/share/livecd-rootfs/checkout-translations-branch \ /usr/share/livecd-rootfs/checkout-translations-branch \
@ -765,13 +777,24 @@ case $PROJECT in
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
#KERNEL_FLAVOURS='oem-22.04' #KERNEL_FLAVOURS='oem-22.04'
KERNEL_FLAVOURS='generic-hwe-22.04' KERNEL_FLAVOURS='generic-hwe-22.04'
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
add_task standard.live ubuntu-live add_package minimal cloud-init
add_package standard cloud-init add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
remove_package standard.live ubiquity-frontend-gtk add_task minimal.standard.live ubuntu-live
add_snap standard.live ubuntu-desktop-installer/classic remove_package minimal.standard.live ubiquity-frontend-gtk
add_snap minimal.standard.live ubuntu-desktop-installer/classic
cat <<-EOF > config/standard.catalog-in.yaml cat <<-EOF > config/minimal.catalog-in.yaml
name: "Ubuntu Desktop for OEM (minimal)"
description: >-
Ubuntu Desktop (minimal) for OEM preinstallation.
id: ubuntu-desktop-oem-minimal
type: fsimage-layered
variant: desktop
locale_support: none
default: yes
EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop for OEM" name: "Ubuntu Desktop for OEM"
description: >- description: >-
Ubuntu Desktop for OEM preinstallation. Ubuntu Desktop for OEM preinstallation.
@ -779,7 +802,6 @@ case $PROJECT in
type: fsimage-layered type: fsimage-layered
variant: desktop variant: desktop
locale_support: none locale_support: none
default: yes
EOF EOF
;; ;;