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

Imported 23.10.39 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-09-19 01:51:08 +00:00
parent 8c127ebec1
commit bc9a35d654
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
livecd-rootfs (23.10.39) mantic; urgency=medium
* The chroot tmpfs mount should only be /var/lib/apt/lists, not
/var/lib/apt; the latter breaks changes to /var/lib/apt/extended_states.
LP: #2036195.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 18 Sep 2023 15:06:23 -0700
livecd-rootfs (23.10.38) mantic; urgency=medium
* desktop: construct a minimal+tpmfde catalog variation, with matching
layers (LP: #2036461)
-- Dan Bungert <daniel.bungert@canonical.com> Mon, 18 Sep 2023 15:48:33 -0600
livecd-rootfs (23.10.37) mantic; urgency=medium livecd-rootfs (23.10.37) mantic; urgency=medium
* fix: ensure minimize-manual script uses passed in argument for all commands (LP: #2036198) * fix: ensure minimize-manual script uses passed in argument for all commands (LP: #2036198)

12
live-build/auto/config
View File

@ -727,12 +727,14 @@ case $PROJECT in
add_snap minimal.standard.live ubuntu-desktop-installer/classic add_snap minimal.standard.live ubuntu-desktop-installer/classic
add_package minimal.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 minimal.enhanced-secureboot cryptsetup boot-managed-by-snapd
add_package minimal.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 minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs"
derive_language_layers minimal.enhanced-secureboot desktop-minimal desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard 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" derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs"
@ -746,6 +748,16 @@ case $PROJECT in
default: yes default: yes
variant: desktop variant: desktop
locale_support: langpack locale_support: langpack
variations:
minimal:
path: minimal.squashfs
EOF
cat <<-EOF > config/minimal.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop-minimal
variations:
minimal-enhanced-secureboot:
path: minimal.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop
EOF EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"

2
live-build/functions
View File

@ -138,7 +138,7 @@ setup_mountpoint() {
# cgroup2 mount for LP: 1944004 # cgroup2 mount for LP: 1944004
mount -t cgroup2 none "$mountpoint/sys/fs/cgroup" mount -t cgroup2 none "$mountpoint/sys/fs/cgroup"
mount -t tmpfs none "$mountpoint/tmp" mount -t tmpfs none "$mountpoint/tmp"
mount -t tmpfs none "$mountpoint/var/lib/apt" mount -t tmpfs none "$mountpoint/var/lib/apt/lists"
mount -t tmpfs none "$mountpoint/var/cache/apt" mount -t tmpfs none "$mountpoint/var/cache/apt"
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"

2
live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
View File

@ -5,6 +5,8 @@ set -eux
case ${PASS:-} in case ${PASS:-} in
minimal.standard.enhanced-secureboot) minimal.standard.enhanced-secureboot)
;; ;;
minimal.enhanced-secureboot)
;;
*) *)
exit 0 exit 0
;; ;;