1922 Commits

Author SHA1 Message Date
Utkarsh Gupta
78a98c6835 Fix unminimize to correctly list packages (LP: #1996489)
Prior to dpkg/1.21.0, there was a bug where dpkg -V/--verify
couldn't list all the correct packages correctly but with
that being fix and in archive since Jammy, this works perfectly
but the syntax to report the missing files have changed. It
just prints 'missing' now. With that new format, we can now
fix the regex to simply list the packages.

With this patch, the unminimize script works flawlessly
on a minimized image.
2023-09-02 00:39:41 +05:30
Łukasz 'sil2100' Zemczak
3a715d2fff Don't reset KERNEL_FLAVOURS for canary. 2023-08-30 16:47:21 +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
0c6e4314e5 canary: switch to use the live task, try to use KERNEL_FLAVOURS instead of a manual kernel add_package. 2023-08-30 11:57:04 +02:00
Steve Langasek
b30e7e4146 lb_chroot_layered: if the unmount of the chroot mountpoint fails, dump mount information for debugging. 2023-08-29 10:39:21 -07: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
Michael Hudson-Doyle
b91452e7fe snap-seed-parse.py: fix builds with no snaps. 2023-08-28 14:02:51 +12:00
Michael Hudson-Doyle
db6f685b84 snap-seed-parse.py: Update to allow parsing uc20-style seeds. (LP: #2028984) 2023-08-28 11:30:11 +12:00
Michael Hudson-Doyle
3d5fd1120c Configure universe sources in canary ISO. (LP: #2033109) 2023-08-28 10:43:52 +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
Michael Hudson-Doyle
5456e4e5e6 Undo preseeding in reset_snapd_state. 2023-08-25 14:50:08 +12:00
Michael Hudson-Doyle
e992090dca add an essay about rsync options 2023-08-23 22:30:44 +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
Steve Langasek
d3a75c9bec Consolidate canary layers to merge 'classic' back into 'standard' 2023-08-23 22:21:32 +12:00
Michael Hudson-Doyle
6890dfe5ca Deduplicate the layers just before creating the squashfs, to enable deduplication of the result of binary hooks as well. 2023-08-23 22:14:15 +12:00
Łukasz 'sil2100' Zemczak
b1a118f4d7 Update canary model assertions.: 2023-08-22 17:15:36 +02:00
Utkarsh Gupta
7b1b63147e Add python3-systemd to our minimized builds
This package is needed by ubuntu-advantage-tools for cloud images
only. u-a-t ultimately will drop this entirely in their next release.
(cf: https://github.com/canonical/ubuntu-pro-client/issues/2692)

So instead of putting this in the seeds and then having to deal
with the seed changes to Mantic (after its release) and SRU of
ubuntu-meta, I'd rather have changes in livecd-rootfs done. Once
python3-systemd dependency is dropped from u-a-t, we'll drop it
from livecd-rootfs in Mantic+, too.
2023-08-22 14:48:33 +05:30
Ł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
Steve Langasek
94ab5c0f7a Merge branch 'meta-squash-fs' into ubuntu/master 2023-08-17 08:16:49 -07:00
Philip Roche
a373fb527c fix: Install required package fuse3 when preseeding snaps (LP: #2031640)
fuse3 was previously installed through recommends but with minimized images we no longer install recommends packages.

It is only required when preseeding snaps so does not need to be present in all minimized images so does not
need to be in the cloud-minimal seed.
2023-08-17 11:50:20 +01:00
Philip Roche
294a65452d fix: Ensure required dependencies are installed before trying grub-install (LP: #2031640)
As a result of not installing recommended packages the packages required to run `grub-install`
are no longer installed by default.

To ensure we can successfully run `grub-install` we install both `grub-pc` and `grub2-common`
packages.
2023-08-17 11:49:11 +01:00
Philip Roche
711c5c291f fix: Remove dangling symlink /boot/initrd.img.old if exists (LP: #2031640)
As a result of not installing recommended packages we have dangling symlink `/boot/initrd.img.old`

As per the preceding `/boot/initrd.img` cleanup. Cleanup of `/boot/initrd.img.old`
only happens if it is a dangling symlink.

These `rm` commands also have `--verbose` flags now to make it easier when debugging logs
2023-08-17 11:48:22 +01:00
Philip Roche
d1ec6f8947 fix: Do not install recommends for ubuntu-cpc minimized project (LP: #2031640)
For minimized images we do not want to install any recommended packages.
We can do this by setting APT::Install-Recommends to false in apt config
or by passing --no-install-recommends to apt-get install.
2023-08-17 11:46:59 +01:00
Utkarsh Gupta
75e67290b6 Merge remote-tracking branch 'hammerstefan/fix-armhf' into ubuntu/master
* hammerstefan/fix-armhf:
  fix(armhf): Fix armhf kernel file detection
2023-08-17 07:06:15 +05:30
Steve Langasek
6f1fc57ebc Merge the minimal and standard layers on the Ubuntu Desktop images (both daily-live and canary), now that there is no separate minimal install target. 2023-08-16 14:35:27 -07:00
Dan Bungert
e03d43e069 canary: drop minimal install source 2023-08-15 18:03:45 -06:00
Dan Bungert
16c1c3499e canary: fix lang layers generation 2023-08-15 18:03:27 -06:00
Dan Bungert
2d33c8de61 canary: fix layer for "classic" variation 2023-08-15 18:01:44 -06:00
Dan Bungert
592f753e26 canary: +dctrl-tools, subiquity uses it 2023-08-15 18:01:12 -06:00
Stefan Hammer
08db5c2418 fix(armhf): Fix armhf kernel file detection
Armhf images install the `generic-lpae` kernel, while other ARCHes use the
standard `generic` kernel when building the "virtual" image flavour.
Code was looking for a kernel binary ending with -generic in armhf
builds, and failed. Add a special condition to handle armhf builds'
kernel ending with `generic-lpae`

References:
[1] https://bugs.launchpad.net/cloud-images/+bug/2029527
2023-08-09 10:09:22 -05:00
Jess Jang
5e96ff013e fix: bind correct apparmor feature for validating snap seed
During Realtime kernel image build, there was an error during
validating snap seed which derivative images copied 5.19
apparmor feature and can't validate when Realtime kernel (5.15)
installed [0].

To prevent this, bind correct apparmor feature with kernel
version.

[0] https://bugs.launchpad.net/ubuntu/+source/livecd-rootfs/+bug/2024639

(cherry picked from commit 6b54faa6be6286017eb2dc701534cf780ae462ce)
2023-08-08 10:12:27 -05:00
Utkarsh Gupta
7647b027b9 Merge branch 'drop-more-packages' into ubuntu/master
* drop-more-packages:
  Avoid purging packages for ubuntu-cpc
2023-08-08 15:44:33 +05:30
Utkarsh Gupta
ca84320688 Avoid purging packages for ubuntu-cpc
With the switch to the ubuntu-cloud-minimal seed, we
don't really need to purge anything now. On the contrary,
the purging of packages if not installed, fails with the
exit code of 100.
2023-08-08 15:17:02 +05:30
Michael Hudson-Doyle
4f6f63dd6b Remove additional dependencies from subiquity units as they are now interfering with the boot process. (LP: #2028862) 2023-08-08 13:02:08 +12:00
Łukasz 'sil2100' Zemczak
494ef427e8 Merge branch 'canary-locale' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master 2023-08-07 11:31:02 +02:00
Dan Bungert
aa2d04bd9d revert KERNEL_FLAVORS=none 2023-08-03 21:39:04 -06:00
Łukasz 'sil2100' Zemczak
4fc64be673 Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into canary-locale 2023-08-03 12:51:12 +02:00
Łukasz 'sil2100' Zemczak
4cc5d37900 Fix changelog version and whitespace. 2023-08-03 12:48:47 +02:00
Dan Bungert
95b37dcb8c budgie: KERNEL_FLAVOURS=none 2023-08-02 16:06:31 -06:00
Dan Bungert
6010b5de5e desktop: KERNEL_FLAVOURS=none
no need to include the kernel directly, it is installed at
runtime (LP: #2026225)
2023-08-02 16:06:31 -06:00
Michael Hudson-Doyle
cf75120068 lb_chroot_layered: use rsync to make more minimal overlay layers. (LP: #2028213) 2023-08-02 13:18:03 +12:00
Heinrich Schuchardt
fd75a28558 risc-v: increase loader 2 partition for VF2
EDK II is available for the StarFive VisionFive 2 board. As it is larger
than U-Boot we need to increase the size of the loader 2 partition to
accommodate it.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-08-01 16:06:00 +02:00
Michael Hudson-Doyle
d3dfb12f85 Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not call force_boot_without_initramfs on s390x rather than disk-image-uefi.binary which obviously would never run on s390x. 2023-07-29 13:02:56 +12:00