2050 Commits

Author SHA1 Message Date
Philip Roche
e1ab57301f fix: Fix calls to unminimize if lxd-installer package not present (LP: #2049723)
The unminimize script will try to install the lxd snap using the shim script
`/usr/sbin/lxd` from the lxd-installer package.

Previously `unminimize` was using `snap`
to install `lxd` directly which was being diverted by diverting the `snap` command.

This is no longer the case so we can remove `/usr/sbin/lxd` from the lxd-installer package
if it exists and then redirect any calls to `/usr/sbin/lxd` to `/bin/true`

This is a cherry pick forward port from Jammy livecd-rootfs version 2.765.37.

(cherry picked from commit 8b83212372e0c1adb1dbdf7ead234f93c52a189e)
2024-01-24 18:04:35 +00:00
Steve Langasek
7de5d67bf7 live-build/auto/config: don't repeatedly add the same pass name to the list of layers. 2024-01-18 11:03:53 -08:00
Thomas Bechtold
f82fb62222 fix: add kernel 6.6 apparmor features tree
Noble moved to the 6.6 kernel now and the preseeding optimization
doesn't work anymore given that the apparmor features used during
preseeding do not match the apparmor features used on a running system
with kernel 6.6 .
2024-01-16 13:03:34 +01:00
Utkarsh Gupta
795927c48c unminimize: Use lxd-installer to install LXD itself (LP: 2036725)
By invoking LXD, lxd-installer will install LXD from the right
place, thereby make it simpler for us to not hardcode the
channel and manually snap install it.
2024-01-09 08:26:21 +05:30
Steve Langasek
650815889f Fix overlooked syntax error in live-build/auto/config. 2024-01-03 23:38:50 -08:00
Steve Langasek
fc6a8a7b94 But include a sensible error message for wrong usage of .live layers
Instead of just returning 'EXPLODE: command not found', heh
2024-01-03 23:03:56 -08:00
Steve Langasek
cdcb44ebf9 include a sanity check that no layered image has more than one "live" layer
This would cause undefined behavior with the LAYERFS_LIVE handling in the
hook.
2023-12-20 22:02:30 -08: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
Steve Langasek
5cc9bbcdd9 Merge branch 'raspi-only-arm64' into ubuntu/master 2023-12-15 23:17:34 -08:00
Erich Eickmeyer
e8e6f967b8 Add casper to minimal.standard.live seed
Without casper in the minimal.standard.live seed for flavors using the
new ubuntu-desktop-installer (or derivitives thereof), casper cannot
create a live user. Without this live user, Ubuntu Studio has been
experiencing the inability to login automatically from either the GUI or
manually from a TTY. This leaves the boot at a black screen with a mouse
cursor. This commit is an attempt to avoid the same situation. Previous
assessments of omitting casper from this line appear to have been
incorrect.
2023-12-15 14:42:27 -06:00
Erich Eickmeyer
0b4fd8b4c0 Fix comment, edubuntu task build, yaml name 2023-12-15 14:42:27 -06:00
Erich Eickmeyer
8fd9a84b92 Switch Edubuntu to new installer 2023-12-15 14:42:27 -06:00
Steve Langasek
4a44b56857 Drop support for building armhf+raspi images; as of noble these are arm64-only. 2023-12-08 18:38:40 -08:00
Steve Langasek
cec2e89119 Explicitly add_package linux-$KERNEL_FLAVOURS in Ubuntu Studio. 2023-12-08 18:33:59 -08:00
Steve Langasek
6ce675b57d Project name for Ubuntu Studio needs to be 'ubuntustudio-dvd' throughout, not 'ubuntustudio'. 2023-12-08 15:07:34 -08:00
Steve Langasek
770125af8c Merge branch 'default-locale-everywhere' into ubuntu/master 2023-12-07 21:21:44 -08:00
Michael Hudson-Doyle
c75f6b3db4 Merge remote-tracking branch 'xypron/umount' into ubuntu/master 2023-12-08 15:41:09 +13:00
Steve Langasek
84e27d0de2 Merge branch 'subarch-manifest' into ubuntu/master 2023-12-06 08:40:50 -08:00
Steve Langasek
323ffd735c Also add support for riscv64 builds with 'generic' subarch
CPC team builds use null subarch but ubuntu-cdimage builds use 'generic'
subarch

https://launchpad.net/~ubuntu-cdimage/+livefs/ubuntu/noble/cpc/+build/542136
2023-12-06 08:38:33 -08:00
Steve Langasek
94082a6601 And support riscv64 builds with no subarch
such as https://launchpad.net/~cloudware/+livefs/ubuntu/noble/cpc/
2023-12-06 00:04:28 -08:00
Steve Langasek
573cde58cd Remove *-dvd glob handling for live layers; Ubuntu Studio is the only remaining "DVD" flavor, and with the move to the new installer this bit is also now incorrect. 2023-12-05 21:18:13 -08:00
Steve Langasek
afdd23e548 Fixup: ubuntustudio task name is ubuntustudio-dvd-live, not ubuntustudio-live 2023-12-05 21:14:53 -08:00
Erich Eickmeyer
6d7797eb95 Remove cloud-init, fix add_task line 2023-12-05 15:40:28 -08:00
Erich Eickmeyer
a514428a9c Remove unnecessary lines 2023-12-05 13:12:00 -08:00
Erich Eickmeyer
72746413df Fixes to add minimal seed 2023-12-05 12:48:40 -08:00
Erich Eickmeyer
f668208cf8 Fixes per vorlon 2023-12-05 11:20:20 -08:00
Erich Eickmeyer
154a932dc7 Switch Ubuntu Studio to new installer 2023-12-05 10:28:42 -08:00
Steve Langasek
220e563de3 live-build/functions: add additional debugging to mount_image() on failure since we again have loop partitions failing to be block devices. 2023-12-03 21:38:20 -08:00
Steve Langasek
a2e35e06d8 Merge remote-tracking branch 'simpoir/lp2007419_add_resolved_to_buildd' into ubuntu/master 2023-12-03 21:26:30 -08:00
Steve Langasek
4fb141bbec Merge remote-tracking branch 'dbungert/adt-hang-vagrant' into ubuntu/master 2023-12-03 21:20:22 -08:00
Steve Langasek
df83a7afed Set C.UTF-8 locale in /etc/default/locale for all images; originally intended to be landed in the cosmic cycle.. 2023-12-03 21:07:54 -08:00
Steve Langasek
5728443d00 Merge remote-tracking branch 'jibel/germinate_with_updates' into ubuntu/master 2023-12-03 19:59:07 -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
Ankush Pathak
19bceac8b3 fix: Re-enable universe for pre-installed images (LP: #2044154) 2023-11-21 11:31:06 -05:00
Yao Wei (魏銘廷)
02a7faaa43 ubuntu-oem: add dummy files in order not to fail make-hooks 2023-11-15 13:06:41 +01:00
Steve Langasek
8fb2180842 Drop cargo-culted code for "preinstalled" images.
Somewhere along the line, we started trying to add packages to the live
environment of flavor "preinstalled" images.  But:

- we don't build preinstalled images for any flavors
- the preinstalled images for projects like cloud images and wsl are
  explicitly excepted from this code
- the only desktop project we do produce preinstalled images for, Ubuntu
  on Raspberry Pi, uses ubuntu-image for building so this code is never
  reached
2023-11-05 16:14:34 +02:00
Steve Langasek
99d2064f32 Drop a few remaining 'legacy' references. 2023-11-05 15:58:23 +02:00
Steve Langasek
74c1ee4bdf We no longer need to remove ubiquity from the Ubuntu live layer and install ubuntu-desktop-installer, this is now handled via the seeds. 2023-11-04 22:01:02 +02:00
Steve Langasek
5634c7e769 Drop the legacy images for both Ubuntu and Ubuntu Budgie. 2023-11-04 21:56:23 +02:00
Brian Murray
22a26cc97a Remove part of a comment which is incorrect 2023-10-31 00:01:48 -07:00
Philip Roche
5d959b24da fix: Enable snap preseeding with ppc64el images where /boot/vmlinux is used instead of /boot/vmlinuz. (LP: #2038957)
ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz. This
is then used to determine the kernel major minor version installed so that the correct apparmor features can be used
during snap preseeding. This preseeding was failing for ppc64el for the mantic 6.5 kernel as the /boot/vmlinuz
being checked did not exist.
2023-10-26 18:02:32 +01:00
Paride Legovini
1586916934 Merge remote-tracking branch 'xypron/armhf' into ubuntu/master 2023-10-25 17:57:14 +02:00
Heinrich Schuchardt
21321ac018 arm: fix console parameter for ARM cloud-images
On armhf and arm64 the QEMU virt machine provides the serial console as an
emulated AMBA PrimeCell UART which the kernel refers to as /dev/ttyAMA0.

Consider this when constructing GRUB_CMDLINE_LINUX_DEFAULT in file
/etc/default/grub.d/50-cloudimg-settings.cfg (LP: #2036730).

Reviewed-by: Gauthier Jolly <gauthier.jolly@canonical.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-10-18 10:20:28 +02:00
Steve Langasek
0a3babb81a call ubuntu-image classic with --debug, because --verbose doesn't give us anything useful in the livefs build logs. 2023-10-11 18:03:30 -07:00
John Chittum
5427e5ad6c
fix: Add 6.5 kernel apparmor feats
lp: #2037567. starting in kernel 6.5.0.1006, there's been an update to
apparmor features. Creates the 6.5 kernel directory, fully populates
with feats checked from a machine running 6.5.0.1006 installed from
proposed (as of 20230927).
2023-10-05 07:30:01 -05:00
Sebastien Bacher
51b7278c4b Update the desktop fde model to include firmware-updater 2023-10-03 21:13:03 +02:00
Dan Bungert
2cccd614a6 oem, budgie: kernel in the live layer 2023-10-03 10:43:35 -06:00