75 Commits

Author SHA1 Message Date
Philip Roche
8cc079fe50 fix(Hyperv Desktop): as we are using oem-config we do not need ubiquity-slideshow-ubuntu
As we are only using oem-config, oem-config-slideshow-ubuntu will suffice

(cherry picked from commit 8fe26586cc1b65621e74121b03c912dcee0e6cf8)
2024-05-24 15:31:16 +01:00
Philip Roche
34edbb9a1c fix(Hyperv Desktop): ubiquity-frontend-gtk is a dependency of the oem-config-gtk package so does not need to be added explicitly
(cherry picked from commit dc2d1318d2d2183f6d80673a1daf5dc8794cd3ed)
2024-05-24 15:31:11 +01:00
Philip Roche
40c7eac14d feat(Hyperv Desktop): Disable cloud-init for Hyperv Desktop images (LP: #2064280)
For Ubuntu 24.04 and later cloud-init is included in desktop images. This is not applicable for Hyperv images so
we can disable cloud-init. This leaves the cloud-init package installed but disabled so users can still
use it if they want.

This is a documented way to disable cloud-init. See https://cloudinit.readthedocs.io/en/latest/howto/disable_cloud_init.html

(cherry picked from commit ff47664d8c646ebae72c40145ee1fd8098185de6)
2024-05-24 15:30:50 +01:00
Phil Roche
b12e271417 fix(HyperV desktop): Ensure removed hyperv dependencies are present in HyperV builds (LP: #2064280)
A change in 8fb21808 also removed many of the dependencies that the hyperv images require.
This removal has been restored in this commit by adding them expliciltly in the hyperv hook.

(cherry picked from commit c459e5e5af0371c0228bd4e5ddec57b8954d39df)
2024-05-24 15:30:45 +01:00
Dan Bungert
9946962363 desktop: move udisks2-inhibit to service (LP: #2063192) 2024-04-23 09:57:57 -06:00
Łukasz 'sil2100' Zemczak
296d580564 Update the 24.04 models. 2024-04-22 13:45:06 +01:00
Łukasz 'sil2100' Zemczak
d6443ce289 24.04 model assertion. 2024-04-18 18:58:17 +02:00
Sebastien Bacher
a2ebc11be0 Rename the casper.gschema override to livecd-rootfs.override
to try to avoid conflicts with the override generated in casper
2024-03-22 11:59:46 +01:00
Sebastien Bacher
fdf1a22b92 Use the ubuntu-desktop-bootstrap snap as the Ubuntu Desktop installer 2024-02-12 21:31:58 +01:00
Simon Quigley
c6a66eaa8d Add missing mkdir invocation from 24.04.26 (LP: #2052617). 2024-02-09 13:32:33 -06:00
Steve Langasek
80cd4153e1 check for glib-compile-schemas presence before calling from the ubuntu hook
This makes the hook ok to use cross-flavor.

We could also move glib-compile-schemas to a separate hook, to ensure we never
silently fail because glib-compile-schemas is broken/missing.
2023-12-20 19:47:14 -08:00
Steve Langasek
6680b3be8d generalize live-build/ubuntu/hooks/020-ubuntu-live.chroot_early
apply this to any layer ending in '.live' so it can be reused across flavors
2023-12-20 19:46:22 -08:00
Steve Langasek
b45cad12b4 Ship static files instead of generating in a hook
When the files we're creating in the live layer have static content, ship
them in live-build/ubuntu/includes.chroot.minimal.standard.live instead of
generating them from live-build/ubuntu/hooks/020-ubuntu-live.chroot_early.

Also fixes the fact that
live-build/ubuntu/hooks/020-ubuntu-live.chroot_early was incorrectly writing
to /root in the previous upload instead of /usr.
2023-12-20 11:39:38 -08:00
Steve Langasek
25d1aa42a1 move code here from scripts/casper-bottom/61desktop_canary_tweaks
this should be done statically at image build time, not at boot.
2023-12-19 12:22:05 -08:00
Dave Jones
2a415654a5 Use oem-config-prepare package
Remove this hook; it's only for pre-installed desktop images and
8fb2180842c452ff08dd41a5746c00bfd69521cf already removed the other bits
for pre-installed desktop images.
2023-11-28 16:00:42 +00:00
Sebastien Bacher
51b7278c4b Update the desktop fde model to include firmware-updater 2023-10-03 21:13:03 +02:00
Dimitri John Ledkov
d5e9651fe0 remove live-build/ubuntu/hooks/020-ubuntu-live.binary: handled elsewhere
Now that kernel names use expected -generic flavour, and kernels are
installed in the live layer, we can go back to stock behaviour of
auto/build noticing that binary hooks are called on a live layer and
executing the extraction & rename of the kernel flavours.

BTW we can even later expand that to support 2 generic abis, and
calling the bigger one the hwe generic such that can also remove
./live-build/ubuntu-server/hooks/04-kernel-bits.binary.

This fixes ubuntu arm64+x13s that is unable to find
ubuntu-x13s.kernel-laptop as due to this hook, which currently
produces ubuntu.kernel-generic in error which is not at all expected
by ubuntu-cdimage. Also this unbreaks producing oem & intel-iot
images, although we will build these in 24.04 only next.

This reverts ubuntu daily-live to use `--linux-flavours
laptop-generic-hwe-22.04` instead of `--linux-flavours none
--linux-packages=none --initramfs=none`, like it did in lunar and
pre-canary-image or images that install kernel in live layer.

Fixes: c00bbf3fb3 ("desktop: place kernel in the live layer")

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-10-02 10:39:29 +01:00
Dimitri John Ledkov
378322380e live-build/ubuntu/hooks: ensure kernel artifacts named with subarch
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-09-29 04:45:12 +01:00
Dan Bungert
41fbfd6bb6 desktop: construct minimal+tpmfde variation 2023-09-18 15:48:41 -06:00
Łukasz 'sil2100' Zemczak
6c608be212 Fix recent build failures by changing kernel/initrd naming and adjust hook conditionals for the minimal layer re-addition. 2023-09-13 11:48:21 +02:00
Dan Bungert
c00bbf3fb3 desktop: place kernel in the live layer
Placing the kernel in the live layer allows for selecting at install
time which kernel to install.
2023-09-07 16:52:53 -06:00
Łukasz 'sil2100' Zemczak
9b33f085c1 Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into canary-as-default 2023-09-05 19:00:32 +02:00
Łukasz 'sil2100' Zemczak
47a88df62f I suppose w don't need the 020-canary-live.binary hook anymore. 2023-08-30 14:25:26 +02:00
Łukasz 'sil2100' Zemczak
353d222c94 Merge branch 'seed.yaml-live' of git+ssh://git.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs into ubuntu/master 2023-08-28 15:48:00 +02:00
Łukasz 'sil2100' Zemczak
4a2e30a3b3 Update enhanced-sb layer model assertion. 2023-08-28 12:23:30 +02:00
Michael Hudson-Doyle
6ab6066c05 Use a traditional seed.yaml style seed for the canary installer's live session. 2023-08-28 21:29:24 +12:00
Steve Langasek
ac65e0b05c Remove obsolete comment. We do want this hook executed for non-canary builds! 2023-08-26 15:14:08 -07:00
Steve Langasek
21333e9889 Drop mke2fs.conf override, no longer needed. 2023-08-26 15:12:09 -07:00
Steve Langasek
cb3f3292b2 i386 foreign-arch support was added for the canary image before 23.04 released, but by mistake it was only added to the squashfs for the live session, and not the squashfs layer used as the source for installation. split the chroot hooks to add this to the standard.squashfs. LP: #2033170. 2023-08-26 15:06:14 -07:00
Michael Hudson-Doyle
f354d76a83 Stop launching a gnome-terminal at startup of the canary live session. (LP: #2032647) 2023-08-25 15:22:02 +12:00
Steve Langasek
2b80fdecd2 No need to use rsync in hooks now to avoid file duplication since layer handling as a whole now uses rsync. 2023-08-23 22:21:41 +12:00
Steve Langasek
b43e3b84f4 Reset /var/lib/snapd in the upper layers before calling snap prepare-image 2023-08-23 22:21:41 +12:00
Łukasz 'sil2100' Zemczak
b1a118f4d7 Update canary model assertions.: 2023-08-22 17:15:36 +02:00
Łukasz 'sil2100' Zemczak
9d9a68d6bf Fix the 020-canary-* hooks referencing the wrong layer names after changes introduced in 23.10.17. 2023-08-18 18:00:24 +02:00
Łukasz 'sil2100' Zemczak
6eca613644 Refresh the canary model assertions. 2023-08-18 17:50:56 +02:00
Łukasz 'sil2100' Zemczak
8a9ba050c3 Make canary images default for Ubuntu. 2023-08-18 12:16:28 +02:00
Łukasz 'sil2100' Zemczak
9d9f7a71a5 canary: use 23.10 models. 2023-07-19 11:06:40 +02:00
Michael Hudson-Doyle
b5387cb32b Disable the orphan_file ext4 feature in the canary live environment so that the installed system can be handled by the e2fsck in the extant kernel snap (cf. bug 2025339). 2023-07-05 11:41:44 +12:00
Michael Hudson-Doyle
7d0aa68826 live-build/ubuntu/hooks/033-disk-image-uefi.binary: update to point at ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary, fixing canary build. 2023-07-05 10:13:38 +12:00
Łukasz 'sil2100' Zemczak
ed8d11d25b Follow up fix to the CHANNEL handling for subiquity images 2023-06-19 10:06:10 +02:00
Dan Bungert
3397098ff8 Allow choosing snap channel on subiquity ISOs 2023-06-16 11:02:37 -06:00
Steve Langasek
9db14f7dee Merge remote-tracking branch 'origin/always-enable-i386' into ubuntu/master 2023-05-26 09:39:35 -07:00
Dan Bungert
6bc353602f canary: fix systems directory 2023-05-10 07:29:37 -06:00
Łukasz 'sil2100' Zemczak
a418f52bd4 Switch canary desktop installer model. 2023-04-26 13:40:17 +02:00
Steve Langasek
a631afcb7f Unconditionally enable i386 in the chroot for Ubuntu Desktop; the new installer doesn't handle enabling this at install time, and late enablement also misses us some recommends. 2023-04-17 16:52:23 -07:00
Dave Jones
b6f1f7b7b3 Remove redundant creation of oem user 2023-04-14 11:18:20 +01:00
Łukasz 'sil2100' Zemczak
97f3799289 Do not reset seeds for canary. 2023-04-13 14:48:09 +02:00
Łukasz 'sil2100' Zemczak
b8649c321f Add default values to PASS in canary hooks. 2023-04-13 09:45:04 +02:00
Łukasz 'sil2100' Zemczak
1dd00d9795 Add the includes as well. 2023-04-06 21:42:12 +02:00
Łukasz 'sil2100' Zemczak
3ec8601feb Ok, early hooks do not have the environment. Just case on canary being the only one using hooks for now. 2023-04-06 19:25:44 +02:00