2303 Commits

Author SHA1 Message Date
Olivier Gayot
01c80d8d0a ubuntu: fix snap components pulled from the wrong model
We have a mechanism in place to override a snap when building an image.
Unfortunately, we didn't factor this in when forcing optional components to be
included in the image.

This was okay before because the stable model and the dangerous model had the
same components declared.

But now that pc-kernel has different components in the stable and the dangerous
model, things are broken.

Indeed, when building the stable image, we tried to include the pc-kernel from
the stable model with the pc-kernel components from the dangerous model. But
they are not compatible.

Fixed by including components from the right model. If we're overriding a snap
with a definition from a different model, then pull the components from that
same model.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-16 16:14:53 +01:00
Olivier Gayot
72511a0381 ubuntu: declare variables from stable & dangerous models
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-16 14:56:13 +01:00
Olivier Gayot
caf4f1030a ubuntu: when building stable image, don't take pc-kernel from beta
The pc-kernel version in 26.04/beta is kernel 6.17, which uses different
components from what is currently declared in the model.

This used to be necessary when there was no kernel in 26.04/stable, but now
there is a 6.8 version in 26.04/stable. The available components match what's
in the model.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-11 17:24:40 -07:00
Olivier Gayot
49e1ab15cd ubuntu: use a local variable where possible
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-11 16:52:22 +01:00
Olivier Gayot
5cbea9f677 ubuntu: add --comp for each optional component from the model
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-11 16:52:22 +01:00
Valentin Haudiquet
44c14b799f refactor: added a function to generate grub config for netboot
Signed-off-by: Valentin Haudiquet <valentin.haudiquet@canonical.com>
2025-12-11 09:27:56 +01:00
Valentin Haudiquet
9fdbaf8d6d riscv/server: add grub efi bootloader in netboot tarballs
This allows netboot tarballs to be PXE booted on QEMU; previously, the tarball was missing bootloader.

Signed-off-by: Valentin Haudiquet <valentin.haudiquet@canonical.com>
2025-12-11 09:27:56 +01:00
Michael Hudson-Doyle
c327ab7bd7
Build Ubuntu Server images with the 'restricted' component enabled. 2025-12-09 12:18:25 +13:00
Olivier Gayot
e5ef47f7dd ubuntu: fix typo in comment
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-12-01 12:51:10 -07:00
Didier Roche
e78505a5f3
Refresh new signed models with mesa
This mesa snap is needed starting with core24 apps.
2025-11-26 08:52:16 +01:00
Didier Roche
98c75ef41b
Switch to new GNOME platform snap 2025-11-25 11:38:49 +01:00
Olivier Gayot
b3ddf6a78a ubuntu: use snapd, desktop-security-center and firmware-updater from edge for TPM/FDE
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-19 10:32:21 +01:00
Olivier Gayot
21372df0f9 ubuntu: update the models for 26.04
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-18 18:24:10 +01:00
Olivier Gayot
001aed3b3b ubuntu: use an array for prepare_args
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-18 18:24:09 +01:00
Olivier Gayot
9164e58d83 ubuntu: build with grade: dangerous but keep most snaps from stable
Because some snaps are not yet in their respective stable channel in 26.04, the
build fails. When preparing the image we can add --snap options to override the
channel of the different snaps. But we can only do that if we're building with
grade: dangerous. As a workaround this issue, we build with the non-dangerous
ISO with the dangerous model, but keep the snaps on their original channel
defined in the non dangerous model.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-11-18 18:23:27 +01:00
Dan Bungert
ec74e75597 desktop: handle unset SUBPROJECT 2025-11-14 08:19:17 -07:00
Dan Bungert
596d6d8464 desktop: update dangerous model for 26.04 2025-10-31 11:14:42 +01:00
Dan Bungert
f6e3d2aedd desktop: use snapd from edge 2025-10-29 13:09:11 +01:00
Dan Bungert
918bc13a3a desktop: use dangerous model until stable channel snaps are available 2025-10-29 13:09:11 +01:00
Michael Hudson-Doyle
a53da7e27b
Merge ~gjolly/livecd-rootfs/+git/livecd-rootfs/+merge/493969 into ubuntu/master 2025-10-23 12:43:36 +13:00
Chad Smith
78d502951b fix(functions): update cloud-init-network.service override for v. 25.3
Update /etc/systemd/system/cloud-init-network.service override to
sync with latest netcat changes in Desktop images.

Resolve traceback:

netcat: /run/cloud-init/share/network.sock: Protocol wrong type for socket

LP: #2128887
2025-10-20 17:07:13 -06:00
Gauthier Jolly
ff6b3824d8 cpc/UEFI: name the GPT partition cloudimg-rootfs
To boot initrdless, the kernel supports a limited number of ways to
specify the location of the root filesystem[1]. One of them is to use
the PARTUUID (which will be different for every cloud-image), another is
to use the PARTLABEL (partition name). To allow the use of PARTLABEL in
the kernel command line and make our cloud-images more self-describing,
set the PARTLABEL to cloudimg-rootfs which is the same label we use for
the file system inside this partition.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/block/early-lookup.c#n217
2025-10-20 09:00:54 +02:00
Gauthier Jolly
ddff3faba3 cpc/UEFI: set the right partition type for the rootfs
To make our disk images more discoverable, we should use the correct
partition type for the root filesystem. This aligns with the
Discoverable Disk Image (DDI) specification developed by the UAPI
group[1] and makes our images more self-describing, e.g. with fdisk,
before:

Device         Start     End Sectors  Size Type
/dev/nbd0p1  2324480 7339998 5015519  2.4G Linux filesystem
...

and now after:

Device         Start     End Sectors  Size Type
/dev/nbd0p1  2324480 7339998 5015519  2.4G Linux root (x86-64)
...

[1] https://uapi-group.org/specifications/specs/discoverable_partitions_specification/
2025-10-20 08:59:26 +02:00
Heinrich Schuchardt
82a239e39c riscv/server: GRUB_TERMINAL=console
Allow using the U-Boot menu both from the serial and the graphical console.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2025-10-14 09:40:52 +02:00
Heinrich Schuchardt
b8520530c9 riscv/server: enforce our RISC-V specific grub configuration
/etc/default/grub.d/50-cloudimg-settings.cfg is currently overriding our
RISC-V specific configuration. Remove it.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2025-10-14 09:40:52 +02:00
Heinrich Schuchardt
7957008902 server/riscv: remove unsupported boards
Since release 25.10 we require support for the rva23s64 profile.
Remove all code relating for boards that do not match this requirement.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2025-10-14 09:40:52 +02:00
Dan Bungert
355f6d5b26 Merge remote-tracking branch 'kajiya/increase-image-size-questing' into ubuntu/master 2025-09-19 09:18:50 -06:00
Chloé Smith
f7e0f39a1d
fix: Increase CPC disk-image base imagesize to 2.5GB
In the ubuntu-cpc disk-image binary we need to avail of the ever increasing size
of packages. 2.2GB is now just a bit too small leading to `No space
left on device` errors when the binary hits `grub-install`. This commit
increases $imagesize to 2.5GB (in the binary as an override initially
implemented in ecaaf0484).

This commit also runs `df` just after the grub-pc && grub2-common
installs to make for easier debugging in the future.

Refs: LP: #2115811
2025-09-19 13:37:56 +01:00
Chad Smith
f7ed2d271e fix(functions): permissions too broad on /etc/netplan/01-network-manager.yaml
netplan apply warns about any /etc/netplan/*.yaml file permissions which
are globally readable.  Set permissions 600 for
/etc/netplan/01-network-manager.yaml in target chroot.

LP: #2119020
2025-09-18 21:39:49 -06:00
Thomas Bechtold
ab658bce7d
Add 6.17 kernel apparmor features preseeds
Questing is currently on kernel 6.17 so preseeding fails with a apparmor
feature mismatch given that the live-build/apparmor/generic tree is
used. Adding a 6.17 tree solves this.
2025-09-18 11:53:10 +02:00
Michael Hudson-Doyle
8de7b2eb10 Disable apparmor_restrict_unprivileged_userns in the live layers. (LP: #2122675) 2025-09-15 12:28:30 +12:00
Michael Hudson-Doyle
2fd6cb1609 add missing file, oops 2025-09-15 12:27:44 +12:00
Michael Hudson-Doyle
785c4c53d3 Fix daily-dangerous builds:
* Fix daily-dangerous builds:
  - Copy hooks.
  - Mangle the channel of seeded snaps to use the edge risk of whichever
    track they are taken from.
  - Update the dangerous model to reference tracks that actually exist.
  - Include providers of content plugs when seeding snaps and creating
    TPMFDE system.
  - Do not attempt to build an UEFI boot image or hyperv desktop image for
    this project/subproject combination.
2025-09-15 09:09:02 +12:00
Dan Bungert
fddd7b7595 edubuntu: set NEEDS_DRACUT=yes 2025-09-10 09:05:30 -06:00
Dan Bungert
ecaaf04844 Merge remote-tracking branch 'dlalaj/fix-buildd-imagesize' into ubuntu/master 2025-09-09 16:52:30 -06:00
Dan Bungert
3ced68dee6 desktop: use dracut 2025-09-08 17:01:45 -06:00
Denis Lalaj
12c92b2cbf fix(buildd): Increase default image size for buildd
Builds for buildd questing are failing due to the increasing pkg sizes,
this calls for an adjustment of the default image size
2025-09-05 12:10:13 -07:00
Tim Andersson
2ae311a772
030-ubuntu-enhanced-sb.binary: remove snap overrides
This is follow up work to LP: #2120473 being resolved.
2025-08-18 10:12:07 +01:00
Tim Andersson
e654618ec5
update classic model for 25.10 2025-08-18 10:12:07 +01:00
Tim Andersson
80aa8b71d6
new: changes to enable daily-dangerous image builds
daily-dangerous image builds are standard desktop images for the devel
series, except all of the snaps are set to their respective edge
channels, and the dangerous model is used, hence its inclusion in this
commit.

Goes hand in hand with this MP:
https://code.launchpad.net/~andersson123/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/490708
2025-08-18 10:11:58 +01:00
Michael Hudson-Doyle
af76e8089d do not completely delete the seed from the live layer 2025-08-13 10:32:03 +12:00
Michael Hudson-Doyle
5494522a14 Put the uc20-style system seed for TPM backed FDE in the live layer. 2025-08-13 10:32:03 +12:00
Utkarsh Gupta
793965ba6c Merge remote-tracking branch 'bryalex/bryalex/6.14-master' into ubuntu/master
* bryalex/bryalex/6.14-master:
  Add debian/changelog entry (LP: #2116199)
  feat(apparmor): Add missing components to 6.14 kernel apparmor features' preseeds
2025-08-12 19:36:17 +05:30
Dan Bungert
6c2b20e070 desktop TPMFDE: move most snaps to stable channels 2025-08-07 16:18:04 -06:00
Dan Bungert
e46416e873 Revert "Move back ubuntu classic to a standard model"
This reverts commit 1c631c99dc2a8fd5759e9c8f872610b1f2238ddf.

We're unfortunately not ready for the standard model yet.
2025-08-07 16:17:20 -06:00
Didier Roche
1c631c99dc
Move back ubuntu classic to a standard model
We don’t use edge anymore. The model still needs to be signed though.
2025-08-06 07:36:59 +02:00
Tim Andersson
3dd6f72a21
switch snaps back to stable now that the TPM FDE spike is over.
This was enabled for more rapid development on the snaps that go into
the live desktop image. Revert now that the spike is over.
2025-07-30 16:49:10 +01:00
Olivier Gayot
a54084218f Build with multipath-tools-boot
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2025-07-24 00:34:44 +02:00
Bryan Alexander
727e75341a feat(apparmor): Add missing components to 6.14 kernel apparmor features' preseeds
- Add the domain/disconnected.ipc component
 - Modified the policy/unconfined_restrictions/io_uring component
(LP: #2116199)
2025-07-17 13:25:12 -07:00
Didier Roche
59e55cb364
Merge branch 'polkit-allow-snap-seeding' into ubuntu/master 2025-07-15 16:30:33 +02:00