mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-16 19:24:06 +00:00
Compare commits
43 Commits
25.10.3
...
ubuntu/mas
Author | SHA1 | Date | |
---|---|---|---|
|
b1604eadc4 | ||
|
af76e8089d | ||
|
5494522a14 | ||
|
e733e7b129 | ||
|
793965ba6c | ||
|
bcf7ded68e | ||
|
6c2b20e070 | ||
|
e46416e873 | ||
|
1c631c99dc | ||
|
3dd6f72a21 | ||
|
b706c97ac2 | ||
|
a54084218f | ||
|
88cd42efd1 | ||
|
727e75341a | ||
|
30107ce354 | ||
|
59e55cb364 | ||
|
69f6b3795b | ||
|
c4fbaf5d3b | ||
|
9fbd9ba71e | ||
|
e672f5ca4c | ||
|
8a70acb1ec | ||
|
56660131e3 | ||
|
4f0c09311d | ||
|
692f72bcee | ||
|
2ea437c340 | ||
|
8ea3c69736 | ||
|
0c0c93a826 | ||
|
4c2baf9e58 | ||
|
8679885bc0 | ||
|
f33c8ba809 | ||
|
20820cc567 | ||
|
231ee26831 | ||
|
60c2e90746 | ||
|
a02700313a | ||
|
208d53affc | ||
|
08be218c82 | ||
|
75ad30fe5d | ||
|
934a269424 | ||
|
eec13dad68 | ||
|
9092fd30e9 | ||
|
a0d948f17b | ||
|
27e3f982e7 | ||
|
37dd412bfa |
114
debian/changelog
vendored
114
debian/changelog
vendored
@ -1,3 +1,117 @@
|
|||||||
|
livecd-rootfs (25.10.16) questing; urgency=medium
|
||||||
|
|
||||||
|
* Put the uc20-style system seed for TPM backed FDE in the live layer.
|
||||||
|
|
||||||
|
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 13 Aug 2025 10:34:39 +1200
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.15) questing; urgency=medium
|
||||||
|
|
||||||
|
* Add missing components to 6.14 kernel apparmor features' preseeds.
|
||||||
|
(LP: #2116199)
|
||||||
|
|
||||||
|
-- Bryan Alexander <bryan.alexander@canonical.com> Thu, 17 Jul 2025 13:27:17 -0700
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.14) questing; urgency=medium
|
||||||
|
|
||||||
|
[ Didier Roche-Tolomelli ]
|
||||||
|
[ Tim Andersson ]
|
||||||
|
[ Daniel Bungert ]
|
||||||
|
* desktop TPMFDE: move snaps back to stable channels
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 07 Aug 2025 16:21:32 -0600
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.13) questing; urgency=medium
|
||||||
|
|
||||||
|
[ Olivier Gayot ]
|
||||||
|
* Build ubuntu-server with multipath-tools-boot installed, so that the
|
||||||
|
multipath stack ends up present in the initramfs.
|
||||||
|
The LVM stack is already present in the initramfs of the installer. And
|
||||||
|
since kinetic, the /dev/mapper entries for LVM devices are created during
|
||||||
|
the initramfs phase. This is a problem when we have LVM on top of a
|
||||||
|
multipath disk because LVM ends up creating /dev/mapper entries out of
|
||||||
|
/dev/sdX (or /dev/sdXpY) devices, not out of /dev/mapper/mpatha as it
|
||||||
|
should. Adding the multipath stack in the initramfs gives multipath a
|
||||||
|
chance to take ownership of /dev/sdX (or /dev/sdXpY) devices before LVM
|
||||||
|
does (LP: #2080474).
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 24 Jul 2025 17:37:33 -0600
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.12) questing; urgency=medium
|
||||||
|
|
||||||
|
[ Zygmunt Krynicki ]
|
||||||
|
* Use snap wait system seed.loaded to wait for snapd (LP: #2114923)
|
||||||
|
|
||||||
|
[ Dennis Loose ]
|
||||||
|
[ Didier Roche-Tolomelli ]
|
||||||
|
* Allow the ubuntu-desktop-installer to request snap seeding state
|
||||||
|
|
||||||
|
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Tue, 15 Jul 2025 16:30:41 +0200
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.11) questing; urgency=medium
|
||||||
|
|
||||||
|
* Fix installer startup to wait for snapd to be preseeded first
|
||||||
|
(LP: #2114923)
|
||||||
|
|
||||||
|
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Fri, 11 Jul 2025 14:57:56 +0200
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.10) questing; urgency=medium
|
||||||
|
|
||||||
|
* risc-v cloud images: enable cpc fixes for riscv64
|
||||||
|
|
||||||
|
-- Adriano Cordova <adriano.cordova@canonical.com> Tue, 01 Jul 2025 09:11:16 -0400
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.9) questing; urgency=medium
|
||||||
|
|
||||||
|
* desktop and server: read $SUBARCH to allow the use of nvidia's kernel
|
||||||
|
instead of generic (LP: #2109822)
|
||||||
|
|
||||||
|
-- Antoine Lassagne <antoine.lassagne@canonical.com> Tue, 17 Jun 2025 22:23:11 +1200
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.8) questing; urgency=medium
|
||||||
|
|
||||||
|
[ Didier Roche-Tolomelli ]
|
||||||
|
* desktop: use snapd from edge
|
||||||
|
* desktop: tpmfde image use desktop-security-center and firmware-updater
|
||||||
|
from edge
|
||||||
|
|
||||||
|
[ Dan Bungert ]
|
||||||
|
* lb_binary_layered: try #2 to fix mtimes in layered squashfses. (LP2107332)
|
||||||
|
Constrain mtime sync to the current upperdir so that files in lower layers
|
||||||
|
are not redundantly included.
|
||||||
|
* server: fix failure to process the hwe kernel layer due to multiple
|
||||||
|
kernels being present (LP: #2112501)
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 13 Jun 2025 12:00:20 -0600
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.7) questing; urgency=medium
|
||||||
|
|
||||||
|
* revert 25.10.6 due to duplicated snaps
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 10 Jun 2025 07:55:40 -0600
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.6) questing; urgency=medium
|
||||||
|
|
||||||
|
* lb_binary_layered: fix mtimes in layered squashfses. (LP: #2107332)
|
||||||
|
Failing to preserve mtime causes unnecessary python pyc rebuilds due to
|
||||||
|
mtime mismatch, and it's generally strange that reinstalling a package
|
||||||
|
that is already installed changes the files on the system (minus
|
||||||
|
intentional differences such as what's going on in the minimized install
|
||||||
|
source).
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 30 May 2025 17:05:15 -0600
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.5) questing; urgency=medium
|
||||||
|
|
||||||
|
* desktop: TPMFDE snapd from latest/edge
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 28 May 2025 10:27:47 -0600
|
||||||
|
|
||||||
|
livecd-rootfs (25.10.4) questing; urgency=medium
|
||||||
|
|
||||||
|
* desktop: TPMFDE kernel from 25.10/candidate
|
||||||
|
|
||||||
|
-- Dan Bungert <daniel.bungert@canonical.com> Sun, 25 May 2025 23:18:59 -0600
|
||||||
|
|
||||||
livecd-rootfs (25.10.3) questing; urgency=medium
|
livecd-rootfs (25.10.3) questing; urgency=medium
|
||||||
|
|
||||||
* desktop: update TPMFDE model and don't skip 020-ubuntu-enhanced-sb.binary.
|
* desktop: update TPMFDE model and don't skip 020-ubuntu-enhanced-sb.binary.
|
||||||
|
1
debian/install
vendored
1
debian/install
vendored
@ -4,3 +4,4 @@ get-ppa-fingerprint usr/share/livecd-rootfs
|
|||||||
minimize-manual usr/share/livecd-rootfs
|
minimize-manual usr/share/livecd-rootfs
|
||||||
checkout-translations-branch usr/share/livecd-rootfs
|
checkout-translations-branch usr/share/livecd-rootfs
|
||||||
update-source-catalog usr/share/livecd-rootfs
|
update-source-catalog usr/share/livecd-rootfs
|
||||||
|
sync-mtime usr/share/livecd-rootfs
|
||||||
|
1
live-build/apparmor/6.14/domain/disconnected.ipc
Normal file
1
live-build/apparmor/6.14/domain/disconnected.ipc
Normal file
@ -0,0 +1 @@
|
|||||||
|
yes
|
@ -484,6 +484,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
|
|||||||
lowlatency-hwe-*)
|
lowlatency-hwe-*)
|
||||||
FLAVOUR="lowlatency"
|
FLAVOUR="lowlatency"
|
||||||
;;
|
;;
|
||||||
|
nvidia-hwe-*)
|
||||||
|
FLAVOUR="nvidia"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
|
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
|
||||||
if [ -z "$KVERS" ]; then
|
if [ -z "$KVERS" ]; then
|
||||||
|
@ -3,7 +3,7 @@ set -e
|
|||||||
|
|
||||||
case $ARCH:$SUBARCH in
|
case $ARCH:$SUBARCH in
|
||||||
amd64:|amd64:generic|amd64:intel-iot|\
|
amd64:|amd64:generic|amd64:intel-iot|\
|
||||||
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
|
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|arm64:nvidia|\
|
||||||
arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|arm64:x13s|\
|
arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|arm64:x13s|\
|
||||||
arm64:largemem|\
|
arm64:largemem|\
|
||||||
armhf:|\
|
armhf:|\
|
||||||
@ -844,6 +844,16 @@ case $PROJECT in
|
|||||||
HAS_DEFAULT_LANGUAGES=yes
|
HAS_DEFAULT_LANGUAGES=yes
|
||||||
LANGUAGE_BASE=desktop
|
LANGUAGE_BASE=desktop
|
||||||
KERNEL_FLAVOURS='generic-hwe-24.04'
|
KERNEL_FLAVOURS='generic-hwe-24.04'
|
||||||
|
|
||||||
|
case $SUBARCH in
|
||||||
|
nvidia)
|
||||||
|
KERNEL_FLAVOURS="nvidia-hwe-24.04"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# nothing to do here.
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
do_layered_desktop_image
|
do_layered_desktop_image
|
||||||
|
|
||||||
# Enchanced secureboot stuff
|
# Enchanced secureboot stuff
|
||||||
@ -999,6 +1009,14 @@ case $PROJECT in
|
|||||||
add_package ubuntu-server-minimal lxd-installer
|
add_package ubuntu-server-minimal lxd-installer
|
||||||
add_task ubuntu-server-minimal.ubuntu-server minimal standard server
|
add_task ubuntu-server-minimal.ubuntu-server minimal standard server
|
||||||
add_package ubuntu-server-minimal.ubuntu-server cloud-init
|
add_package ubuntu-server-minimal.ubuntu-server cloud-init
|
||||||
|
# If we have a multipath disk with LVM on top, we want to give
|
||||||
|
# multipath a chance to create the /dev/mapper/mpatha entry
|
||||||
|
# during the initramfs phase. Otherwise LVM will "steal" the
|
||||||
|
# device (e.g., /dev/sda2) and prevent multipath from using it
|
||||||
|
# after pivoting to the root filesystem of the live
|
||||||
|
# environment.
|
||||||
|
# See LP: #2080474 and LP: #1480399.
|
||||||
|
add_package ubuntu-server-minimal.ubuntu-server.installer multipath-tools-boot
|
||||||
|
|
||||||
add_task ubuntu-server-minimal.ubuntu-server.installer server-live
|
add_task ubuntu-server-minimal.ubuntu-server.installer server-live
|
||||||
|
|
||||||
@ -1023,6 +1041,9 @@ case $PROJECT in
|
|||||||
# variants='ga-64k hwe-64k'
|
# variants='ga-64k hwe-64k'
|
||||||
variants='ga-64k'
|
variants='ga-64k'
|
||||||
;;
|
;;
|
||||||
|
nvidia)
|
||||||
|
variants='nvidia'
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
# variants='ga hwe'
|
# variants='ga hwe'
|
||||||
variants='ga'
|
variants='ga'
|
||||||
@ -1060,21 +1081,20 @@ case $PROJECT in
|
|||||||
elif [ "$variant" = "tegra-jetson" ]; then
|
elif [ "$variant" = "tegra-jetson" ]; then
|
||||||
kernel_metapkg=linux-nvidia-tegra-jetson
|
kernel_metapkg=linux-nvidia-tegra-jetson
|
||||||
flavor=nvidia-tegra-jetson
|
flavor=nvidia-tegra-jetson
|
||||||
|
elif [ "$variant" = "nvidia" ]; then
|
||||||
|
kernel_metapkg=linux-nvidia-hwe-$(lsb_release -sr)
|
||||||
|
flavor=nvidia
|
||||||
else
|
else
|
||||||
echo "bogus variant: $variant"
|
echo "bogus variant: $variant"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
add_pass ubuntu-server-minimal.ubuntu-server.installer.$flavor
|
|
||||||
if [ "$first_kernel" = "y" ]; then
|
if [ "$first_kernel" = "y" ]; then
|
||||||
# Put the first kernel offered into the base layer
|
# Put the first kernel offered into the base layer
|
||||||
kernel_layer=ubuntu-server-minimal
|
|
||||||
first_kernel=n
|
first_kernel=n
|
||||||
else
|
add_package ubuntu-server-minimal $kernel_metapkg
|
||||||
# and subsequent ones into their own layer
|
|
||||||
kernel_layer=ubuntu-server-minimal.ubuntu-server.installer.$flavor
|
|
||||||
fi
|
fi
|
||||||
add_package $kernel_layer $kernel_metapkg
|
add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
|
||||||
|
|
||||||
LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
|
LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
|
||||||
done
|
done
|
||||||
|
@ -565,8 +565,14 @@ _snap_post_process() {
|
|||||||
core[0-9]*)
|
core[0-9]*)
|
||||||
# If the 'core' snap is not present, assume we are coreXX-only and
|
# If the 'core' snap is not present, assume we are coreXX-only and
|
||||||
# install the snapd snap.
|
# install the snapd snap.
|
||||||
|
channel=stable
|
||||||
|
# FIXME: This can be commented and uncommented to enable snaps from
|
||||||
|
# edge for development spikes.
|
||||||
|
# if [ $PROJECT = "ubuntu" ]; then
|
||||||
|
# channel=edge
|
||||||
|
# fi
|
||||||
if [ ! -f ${snaps_dir}/core_[0-9]*.snap ]; then
|
if [ ! -f ${snaps_dir}/core_[0-9]*.snap ]; then
|
||||||
_snap_preseed $CHROOT_ROOT snapd stable
|
_snap_preseed $CHROOT_ROOT snapd "$channel"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
core)
|
core)
|
||||||
|
@ -163,15 +163,24 @@ build_layered_squashfs () {
|
|||||||
# (rather than the default which is to skip copies based
|
# (rather than the default which is to skip copies based
|
||||||
# on size + mtime)
|
# on size + mtime)
|
||||||
# --no-times to not copy mtimes from source to dest (we
|
# --no-times to not copy mtimes from source to dest (we
|
||||||
# don't care about mtime in the image and want to
|
# do care about mtime in the image but want to
|
||||||
# deduplicate files that have indentical contents but
|
# deduplicate files that have indentical contents but
|
||||||
# different mtimes)
|
# different mtimes, and mtime will be fixed below)
|
||||||
# --del because we want to remove files that have been
|
# --del because we want to remove files that have been
|
||||||
# deleted in this layer.
|
# deleted in this layer.
|
||||||
rsync -aXHAS --checksum --no-times --del chroot/ chroot-2/
|
rsync -aXHAS --checksum --no-times --del chroot/ chroot-2/
|
||||||
umount chroot-2
|
umount chroot-2
|
||||||
rmdir chroot-2
|
rmdir chroot-2
|
||||||
overlay_dir="$overlay_dir-2"
|
overlay_dir="$overlay_dir-2"
|
||||||
|
# We use rsync with --no-times rsync (see above)
|
||||||
|
# for the absolute best size reduction. But there are
|
||||||
|
# cases where we want mtime preservation to match what
|
||||||
|
# was found in the original archive packages, such as
|
||||||
|
# keeping .py mtime in sync with the matching .pyc.
|
||||||
|
# Operate on the upperdir directly, so that we are only
|
||||||
|
# modifying mtime on files that are actually changed in
|
||||||
|
# this layer. LP: #2107332
|
||||||
|
/usr/share/livecd-rootfs/sync-mtime chroot "$overlay_dir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
create_squashfs "${overlay_dir}" ${squashfs_f}
|
create_squashfs "${overlay_dir}" ${squashfs_f}
|
||||||
|
@ -100,7 +100,7 @@ fi
|
|||||||
|
|
||||||
case $arch in
|
case $arch in
|
||||||
# ppc, riscv64 and s390x images are special
|
# ppc, riscv64 and s390x images are special
|
||||||
powerpc|ppc64el|s390x|riscv64)
|
powerpc|ppc64el|s390x)
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
18
live-build/ubuntu-server/hooks/02-hwe-kernel.chroot_early
Executable file
18
live-build/ubuntu-server/hooks/02-hwe-kernel.chroot_early
Executable file
@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/bash -eux
|
||||||
|
# vi: ts=4 noexpandtab
|
||||||
|
|
||||||
|
case $PASS in
|
||||||
|
ubuntu-server-minimal.ubuntu-server.installer.*.*)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
ubuntu-server-minimal.ubuntu-server.installer.*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# remove excess kernels. auto/config arranges for the correct one to be
|
||||||
|
# installed.
|
||||||
|
|
||||||
|
apt-get --yes remove --purge 'linux-image*'
|
@ -1,66 +1,24 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
|
# We need to remove the snapd seed configuration for the layers that
|
||||||
|
# will be the installation source for a TPM-backed FDE install or
|
||||||
|
# snapd gets very confused on the boot of the target system.
|
||||||
|
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
case ${PASS:-} in
|
case ${PASS:-} in
|
||||||
minimal.standard.enhanced-secureboot)
|
*.enhanced-secureboot)
|
||||||
;;
|
|
||||||
minimal.enhanced-secureboot)
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
. config/functions
|
||||||
|
|
||||||
if [ -n "${SUBPROJECT:-}" ]; then
|
if [ -n "${SUBPROJECT:-}" ]; then
|
||||||
echo "We don't run Ubuntu Desktop hooks for this project."
|
echo "We don't run Ubuntu Desktop hooks for this project."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
. config/binary
|
|
||||||
. config/functions
|
|
||||||
|
|
||||||
# Generation of the model:
|
|
||||||
# * At https://github.com/canonical/models one can find a repo of raw,
|
|
||||||
# unsigned, input .json files, and their signed .model equivalents.
|
|
||||||
# * At least once per cycle, update the json for the new Ubuntu version.
|
|
||||||
# To do this, take the previous cycle ubuntu-classic-$ver-amd64.json file,
|
|
||||||
# rename for the new version, and do any necessary updates including fixing
|
|
||||||
# the versions of tracks.
|
|
||||||
# * When this is done, the json needs to be signed. This needs to be done by
|
|
||||||
# a Canonical employee - try asking someone who has recently opened PRs on
|
|
||||||
# https://github.com/canonical/models with the signed models.
|
|
||||||
# * Ensure the signed and unsigned version of the models are updated in the
|
|
||||||
# models repo.
|
|
||||||
# * The signed model can then be placed here in livecd-rootfs at
|
|
||||||
# live-build/${PROJECT}/ubuntu-classic-amd64.model
|
|
||||||
|
|
||||||
# env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2410-amd64 > config/classic-model.model
|
|
||||||
model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64.model
|
|
||||||
|
|
||||||
# see below note about "dangerous" model
|
|
||||||
CHANNEL=${CHANNEL:-stable}
|
|
||||||
|
|
||||||
channel=""
|
|
||||||
if [ -n "${CHANNEL:-}" ]; then
|
|
||||||
channel="--channel $CHANNEL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
reset_snapd_state chroot
|
reset_snapd_state chroot
|
||||||
|
|
||||||
# Set UBUNTU_STORE_COHORT_KEY="+" to force prepare-image to fetch the latest
|
|
||||||
# snap versions regardless of phasing status
|
|
||||||
|
|
||||||
# this is the normal prepare-image invocation. This is not used right now as
|
|
||||||
# the model in question is the "dangerous" model so that we can override the
|
|
||||||
# channel of pc-kernel to get a matching set of snaps.
|
|
||||||
# env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \
|
|
||||||
# --classic $model $channel chroot
|
|
||||||
# so instead we're doing this, including forcing channel to stable for
|
|
||||||
# everything but pc-kernel.
|
|
||||||
env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \
|
|
||||||
--classic $model $channel --snap=pc-kernel=25.04/edge chroot
|
|
||||||
|
|
||||||
mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop
|
|
||||||
rm -rf chroot/var/lib/snapd/seed
|
|
||||||
mv chroot/system-seed chroot/var/lib/snapd/seed
|
|
||||||
|
74
live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
Normal file
74
live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# create the system seed for TPM-backed FDE in the live layer of the installer.
|
||||||
|
|
||||||
|
set -eux
|
||||||
|
|
||||||
|
case ${PASS:-} in
|
||||||
|
*.live)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
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
|
||||||
|
|
||||||
|
# Generation of the model:
|
||||||
|
# * At https://github.com/canonical/models one can find a repo of raw,
|
||||||
|
# unsigned, input .json files, and their signed .model equivalents.
|
||||||
|
# * At least once per cycle, update the json for the new Ubuntu version.
|
||||||
|
# To do this, take the previous cycle ubuntu-classic-$ver-amd64.json file,
|
||||||
|
# rename for the new version, and do any necessary updates including fixing
|
||||||
|
# the versions of tracks.
|
||||||
|
# * When this is done, the json needs to be signed. This needs to be done by
|
||||||
|
# a Canonical employee - try asking someone who has recently opened PRs on
|
||||||
|
# https://github.com/canonical/models with the signed models.
|
||||||
|
# * Ensure the signed and unsigned version of the models are updated in the
|
||||||
|
# models repo.
|
||||||
|
# * The signed model can then be placed here in livecd-rootfs at
|
||||||
|
# live-build/${PROJECT}/ubuntu-classic-amd64.model
|
||||||
|
|
||||||
|
# env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2410-amd64 > config/classic-model.model
|
||||||
|
model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64.model
|
||||||
|
|
||||||
|
# see below note about "dangerous" model
|
||||||
|
CHANNEL=${CHANNEL:-stable}
|
||||||
|
|
||||||
|
channel=""
|
||||||
|
if [ -n "${CHANNEL:-}" ]; then
|
||||||
|
channel="--channel $CHANNEL"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set UBUNTU_STORE_COHORT_KEY="+" to force prepare-image to fetch the latest
|
||||||
|
# snap versions regardless of phasing status
|
||||||
|
|
||||||
|
# this is the normal prepare-image invocation. This is not used right now as
|
||||||
|
# the model in question is the "dangerous" model so that we can override the
|
||||||
|
# channel of pc-kernel and others to get a matching set of snaps.
|
||||||
|
# env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \
|
||||||
|
# --classic $model $channel chroot
|
||||||
|
# FIXME - go back to the stable model and remove all the `--snap` overrides
|
||||||
|
env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \
|
||||||
|
--classic $model $channel \
|
||||||
|
--snap=pc=classic-25.10/stable \
|
||||||
|
--snap=pc-kernel=25.10/candidate \
|
||||||
|
--snap=firmware-updater=1/stable/ubuntu-25.10 \
|
||||||
|
--snap=desktop-security-center=1/stable/ubuntu-25.10 \
|
||||||
|
--snap=prompting-client=1/stable/ubuntu-25.10 \
|
||||||
|
--snap=snap-store=2/stable/ubuntu-25.10 \
|
||||||
|
--snap=gtk-common-themes=latest/stable/ubuntu-25.10 \
|
||||||
|
--snap=firefox=latest/stable/ubuntu-25.10 \
|
||||||
|
--snap=gnome-42-2204=latest/stable/ubuntu-25.10 \
|
||||||
|
--snap=snapd-desktop-integration=latest/stable/ubuntu-25.10 \
|
||||||
|
chroot
|
||||||
|
|
||||||
|
mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop
|
||||||
|
rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
|
||||||
|
rm -rf chroot/system-seed/
|
@ -0,0 +1,13 @@
|
|||||||
|
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||||
|
//
|
||||||
|
// THIS FILE IS ONLY AVAILABLE ON THE LIVE SYSTEM
|
||||||
|
//
|
||||||
|
// Allow the ubuntu-desktop-installer to request snap seeding state
|
||||||
|
// used before starting.
|
||||||
|
|
||||||
|
polkit.addRule(function(action, subject) {
|
||||||
|
if (action.id == "io.snapcraft.snapd.manage-configuration") {
|
||||||
|
return polkit.Result.YES;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
@ -10,6 +10,8 @@ Conflicts=gnome-session@gnome-login.target
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
|
# Make sure that the system was seeded to access the snap
|
||||||
|
ExecStartPre=/usr/bin/snap wait system seed.loaded
|
||||||
ExecStart=/snap/bin/ubuntu-desktop-bootstrap --try-or-install
|
ExecStart=/snap/bin/ubuntu-desktop-bootstrap --try-or-install
|
||||||
ExecStopPost=sh -c "gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed true; gsettings set org.gnome.shell.extensions.dash-to-dock intellihide true; gnome-extensions enable ding@rastersoft.com"
|
ExecStopPost=sh -c "gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed true; gsettings set org.gnome.shell.extensions.dash-to-dock intellihide true; gnome-extensions enable ding@rastersoft.com"
|
||||||
Restart=no
|
Restart=no
|
||||||
|
38
sync-mtime
Executable file
38
sync-mtime
Executable file
@ -0,0 +1,38 @@
|
|||||||
|
#!/usr/bin/python3
|
||||||
|
|
||||||
|
# usage: sync-mtime src dst
|
||||||
|
#
|
||||||
|
# synchronize atime/mtime on files between src and dst.
|
||||||
|
#
|
||||||
|
# src and dst are directories, where dst is expected to contain a subset of the
|
||||||
|
# files found in src. for each file present in dst or a subdirectory thereof,
|
||||||
|
# if atime/mtime differ between the same file in src and that file in dst,
|
||||||
|
# update atime/mtime on the file in dst.
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def time_eq(a: os.stat_result, b: os.stat_result) -> bool:
|
||||||
|
return (
|
||||||
|
(a.st_mtime_ns == b.st_mtime_ns) and
|
||||||
|
(a.st_atime_ns == b.st_atime_ns)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
src, dst = sys.argv[1:]
|
||||||
|
for dirpath, dirnames, filenames in Path(dst).walk():
|
||||||
|
for filename in filenames:
|
||||||
|
dst_file = dirpath / filename
|
||||||
|
if not dst_file.is_file():
|
||||||
|
continue
|
||||||
|
src_file = src / dst_file.relative_to(dst)
|
||||||
|
|
||||||
|
src_stat = src_file.stat(follow_symlinks=False)
|
||||||
|
dst_stat = dst_file.stat(follow_symlinks=False)
|
||||||
|
if time_eq(src_stat, dst_stat):
|
||||||
|
continue
|
||||||
|
|
||||||
|
ns = (src_stat.st_atime_ns, src_stat.st_mtime_ns)
|
||||||
|
os.utime(dst_file, ns=ns, follow_symlinks=False)
|
Loading…
x
Reference in New Issue
Block a user