Steve Langasek
6fac77b481
Revert "Revert "Revert "Revert the recent kpartx->losetup changes, as we need to put some other changes on top. Let's try to re-introduce this for MM."""
...
This reverts commit 1931bbcb194febe241aa82f03a6730ba82a84409.
2023-05-26 09:41:41 -07:00
Steve Langasek
9db14f7dee
Merge remote-tracking branch 'origin/always-enable-i386' into ubuntu/master
2023-05-26 09:39:35 -07:00
Łukasz 'sil2100' Zemczak
8eba29578e
Fix small typo
2023-05-24 16:41:14 +02:00
Łukasz 'sil2100' Zemczak
8b6085bb67
Some initial work on getting Ubuntu Budgie building new installer images.
2023-05-24 15:31:04 +02:00
Łukasz 'sil2100' Zemczak
1931bbcb19
Revert "Revert "Revert the recent kpartx->losetup changes, as we need to put some other changes on top. Let's try to re-introduce this for MM.""
...
This reverts commit ada1f09b39332ec828369e0a30f2870df5c4dc3e.
2023-05-24 11:06:56 +02:00
Łukasz 'sil2100' Zemczak
4dbd985231
Revert "Try to use udevadm settle after losetup to resolve race in riscv64 image builds."
...
This reverts commit ef146db89529fc7fbc48052e0b684f7cb95f34ee.
2023-05-24 11:05:47 +02:00
Steve Langasek
5157d775f9
The base seed for edubuntu is desktop-gnome, not desktop. LP: #2019060 .
2023-05-17 23:50:51 -07:00
Michael Hudson-Doyle
628134dfe7
auto/config: alter check for unexpectedly seeded snaps in ubuntu-cpc:minimized build. As the build no longer implicitly seeds the snaps from the server seed, we can just assert no snaps are seeded. This fixes an autopkgtest regression but also cleaner.
2023-05-18 11:21:58 +12:00
Michael Hudson-Doyle
35a56a5e03
auto/config: switch ubuntucinnamon and ubuntu-unity builds to use add_task to get their desktop packages. Previously most (all?) flavour builds got the snaps from that flavour's "desktop" seed implicitly added, but now an explicit add_task is needed.
2023-05-18 09:33:48 +12:00
Steve Langasek
d377e535b2
Drop use of --removable flag to grub-install from buildd/hooks
...
This now matches the cloud images (7c760864fdcb278ca37396f06f5e3f297428d63d)
fixing bootloader updates in the buildd images, but also fixing
compatibility with using devtmpfs for losetup.
2023-05-17 09:27:08 -07:00
Michael Hudson-Doyle
cafbd6f7d6
actual content change to drop edubuntu referencing ubuntu-desktop-minimal task
2023-05-17 15:53:46 +12:00
Michael Hudson-Doyle
8704aafecc
live-build/expand-task: handle seeding of classic snaps correctly.
2023-05-17 15:49:41 +12:00
Michael Hudson-Doyle
734da44d00
live-build/expand-task: Fix expansion of tasks with non-flavour specific name (e.g. "minimal") when building a non-Ubuntu flavour.
2023-05-17 15:45:12 +12:00
Michael Hudson-Doyle
01b851e162
auto/config: Set FLAVOUR appropriately for flavours added since the expand-task branch was created.
2023-05-17 15:41:54 +12:00
Michael Hudson-Doyle
a65c181596
auto/config: Rewrite add_task to use a Python script that cribs the logic from lp:ubuntu-archive-publishing's generate_extra_overrides.py. This means we can avoid some dubious hacks around seeding snaps and no longer depend on the Task headers in the archive.
2023-05-12 13:19:47 +12:00
Dan Bungert
55ecac3ca7
canary: include cryptsetup in the live layer
2023-05-11 19:07:20 -06:00
Dan Bungert
6bc353602f
canary: fix systems directory
2023-05-10 07:29:37 -06:00
Steve Langasek
cfbcf2d690
Use the correct seed base for edubuntu. LP: #2019060 .
2023-05-09 19:06:48 -07:00
Steve Langasek
ef146db895
Try to use udevadm settle after losetup to resolve race in riscv64 image builds.
2023-05-08 15:47:04 -07:00
Steve Langasek
ada1f09b39
Revert "Revert the recent kpartx->losetup changes, as we need to put some other changes on top. Let's try to re-introduce this for MM."
...
This reverts commit 7b07db91110a3dda2723bc853a43f81c4e2a2f75.
2023-05-02 15:27:41 +02:00
Łukasz 'sil2100' Zemczak
a418f52bd4
Switch canary desktop installer model.
2023-04-26 13:40:17 +02:00
Łukasz 'sil2100' Zemczak
fba9d176a6
Add cinnamon, unity and edubuntu to the workaround list.
2023-04-18 10:24:07 +01:00
Łukasz 'sil2100' Zemczak
7b07db9111
Revert the recent kpartx->losetup changes, as we need to put some other changes on top. Let's try to re-introduce this for MM.
2023-04-18 10:10:28 +01:00
Steve Langasek
1e0daf6af9
Clean up some remaining references to /dev/mapper.
2023-04-17 18:50:08 -07: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
Steve Langasek
6b40317404
Use the correct path for the loop device.
2023-04-17 16:11:50 -07:00
Steve Langasek
a130ee17c3
Call losetup -d properly.
2023-04-17 12:22:17 -07:00
Steve Langasek
5e4b2d3cc3
Use losetup instead of kpartx to set up loopback partitions
...
kpartx on riscv64 appears to be racy. Rather than trying to debug these
fraught races somewhere between udev and libdevmapper, we can use losetup
which should be simpler and less error-prone.
2023-04-17 08:20:49 -07:00
Steve Langasek
4112488a44
Merge remote-tracking branch 'lool/add-tegra-liver-server' into ubuntu/master
2023-04-14 16:45:08 -07:00
Loïc Minier
9f3b345b06
Initial support for NVIDIA Tegra
...
live-build/auto/config:
- for Ubuntu Server live images and the arm64+tegra full arch, build a
tegra variant with linux-nvidia-tegra as the flavor and
linux-nvidia-tegra as the kernel meta-package
- default to nvidia-$SUBARCH as the kernel flavor for all images using
arm64+tegra as full arch
hooks/03-kernel-metapkg.chroot_early:
- use linux-nvidia-tegra as kernel meta-package for the nvidia-tegra
flavor
2023-04-14 23:21:43 +00:00
Dave Jones
b6f1f7b7b3
Remove redundant creation of oem user
2023-04-14 11:18:20 +01:00
Łukasz 'sil2100' Zemczak
ac8f964b19
Fix for netboot tarballs generation.
2023-04-13 19:41:16 +02:00
Łukasz 'sil2100' Zemczak
97f3799289
Do not reset seeds for canary.
2023-04-13 14:48:09 +02:00
Łukasz 'sil2100' Zemczak
735db252ed
For canary images, actually consider moving the seed listed snaps from both minimal and standard layers to the classic layer.
2023-04-13 11:47:47 +02:00
Łukasz 'sil2100' Zemczak
b8649c321f
Add default values to PASS in canary hooks.
2023-04-13 09:45:04 +02:00
Steve Langasek
a13f729927
Make PROPOSED=1 builds work with NotAutomatic (lunar and later). LP: #2016022 .
2023-04-12 10:40:53 -07:00
Steve Langasek
9fc5d2ce13
Update infinite_scream URL to mastodon
2023-04-12 09:38:00 -07:00
John Chittum
c0af2ca443
fix: riscv64 efi conditional
...
missing a && between icicle and visionfive, led to /boot/efi still being
in place, and grub-install running instead of exiting the func.
fixes LP:2015750
2023-04-10 07:33:08 -05:00
Chad Smith
9a82720f1c
cloud-init: prefer netplan to handle all network manager config
...
Cloud-init cannot write directly to
/etc/NetworkManager/system-connections because subiquity may
need to emit config to /etc/netplan/00-installer.yaml and call
netplan apply for autoinstall.network use-cases.
When cloud-init's config is written directly to
/etc/NetworkManager, neither netplan nor subiquity has knowledge of
this config and this results in namespace collisions in NetworkManager
due to `netplan-` named connections and `cloud-init` connection ids
fighting over which config own a given interface name.
Deleting this config overlay allows subiquity to manage all network
setup when it needs to with netplan directly.
Subiquity already has logic to rename any unwanted netplan
configuration when it intends to write cfg and run netplan apply[1].
This should allow subiquity full control of network config when needed.
[1] https://github.com/canonical/subiquity/blob/
92ac6544cdfedfd332d8cd94dbcfad0aab994575/subiquitycore/
controllers/network.py#L267
LP: #2015605
2023-04-07 17:09:11 -06: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
Łukasz 'sil2100' Zemczak
3752ea7cf1
Add -eu to the early hook as well.
2023-04-06 16:47:59 +02:00
Łukasz 'sil2100' Zemczak
edc6a7d576
SUBPROJECT is not defined by default in chroot_early hooks.
2023-04-06 16:45:58 +02:00
Łukasz 'sil2100' Zemczak
6a2cb2be27
Fix using the wrong branch name for ubuntu-image.
2023-04-06 16:05:32 +02:00
Łukasz 'sil2100' Zemczak
1fe8f8f178
Another missed change - pass IMAGEFORMAT further down.
2023-04-06 12:40:51 +02:00
Łukasz 'sil2100' Zemczak
59f12263ed
Some missing changes for image definition handling.
2023-04-06 10:05:40 +02:00
Łukasz 'sil2100' Zemczak
4997edb190
Use never model assertion.
2023-04-06 09:21:27 +02:00
Łukasz 'sil2100' Zemczak
959011d5fc
Some fixes per review - thanks Dan!
2023-04-06 09:19:29 +02:00
Łukasz 'sil2100' Zemczak
7673c4f98f
For now, don't build the base images with ubuntu-image.
2023-04-05 22:20:46 +02:00
Łukasz 'sil2100' Zemczak
dc89df7ee2
Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into ui-by-default
2023-04-05 22:20:10 +02:00
