Compare commits

..

75 Commits

Author SHA1 Message Date
Utkarsh Gupta
18300375dd Update d/ch for 24.04.93 release 2025-08-12 20:07:32 +05:30
Utkarsh Gupta
7f6c20edac Merge remote-tracking branch 'bryalex/bryalex/6.14-noble' into ubuntu/noble
* bryalex/bryalex/6.14-noble:
  Add debian/changelog entry (LP: #2116199)
  feat(apparmor): Add 6.14 kernel apparmor features' preseeds
2025-08-12 20:04:32 +05:30
Dan Bungert
2b52891daf releasing package livecd-rootfs version 24.04.92 2025-07-31 11:27:46 -06:00
Dan Bungert
1ff53fd2d3 Revert "functions: proper cloud-init.service full unit override in etc"
This reverts commit 736099c6b6ae5e5a27f72fd697fe02e91bb10fac.
2025-07-31 11:26:05 -06:00
Juerg Haefliger
b05cffdb55 releasing package livecd-rootfs version 24.04.91 2025-07-30 17:38:38 +02:00
Juerg Haefliger
182b6a5f5b build: Fix lowlatency kernel flavour name
Nowadays the lowlatency kernel is just the generic kernel with some
bootargs to make it lowlatency. Hence the flavour name is 'generic'.
2025-07-30 17:38:31 +02:00
Dan Bungert
069bcfedd2 releasing package livecd-rootfs version 24.04.90 2025-07-22 15:50:36 -06:00
Chad Smith
736099c6b6 functions: proper cloud-init.service full unit override in etc
System override drop-ins cannot redact dependencies (Before or After) and
thus require a full unit override. Avoid writing the unit file delivered
by cloud-init deb package in /lib/systemd/system/cloud-init.service because
it will generate warnings fron debsums -c about modified files.

The correct place to provide a full unit override is in
/etc/systemd/system/cloud-init.service in order to drop
Before=sysinit.target from the packaged cloud-init.service file.

Note vigilance will be needed across cloud-init SRU boundaries to ensure
we sync any cloud-init.service unit changes that are introduced to
stable releases because livecd-rootfs is overriding the whole file.

LP: #2069391
(cherry picked from commit 97dd81183b3222b05cc53c3637e934fc2c61a5f0)
2025-07-21 16:04:34 +02:00
Bryan Alexander
149fe6e781 Add debian/changelog entry (LP: #2116199) 2025-07-17 13:06:33 -07:00
Bryan Alexander
11813f299a feat(apparmor): Add 6.14 kernel apparmor features' preseeds
Add apparmor feature preseeds for 6.14 kernel.
(LP: #2116199)
2025-07-14 01:25:37 -07:00
Dan Bungert
84e51f8d9f releasing package livecd-rootfs version 24.04.89 2025-04-30 15:27:51 -06:00
Dan Bungert
7d2975740d desktop: remove references to subiquity snap
No subiquity snap is present on Desktop isos, these are cruft.

(cherry picked from commit 5e990020e5280152ce7387b707ad5c6dba623ae4)
2025-04-16 09:44:20 -06:00
Adriano Cordova
cddd73d626 Fix changelog typo from 25.04.88 to 24.04.88
Signed-off-by: Adriano Cordova <adriano.cordova@canonical.com>
2025-04-02 16:06:32 -03:00
Michael Hudson-Doyle
fa4167f97e combine changelog entries as this will be a single upload 2025-03-07 09:05:06 +13:00
Adriano Cordova
0b21f55ba4 riscv: add SUBARCH 'jh7110'
Add SUBARCH 'jh7110' for jh7110-based boards
2025-02-25 15:32:46 -03:00
Adriano Cordova
eb650f1d34 riscv: directly copy device trees to the ESP instead of relying on flash-kernel 2025-02-24 23:35:42 -03:00
Utkarsh Gupta
419e83058d Update d/ch for 24.04.87 release 2025-02-21 14:38:02 +05:30
Utkarsh Gupta
547ee62e66 Merge remote-tracking branch 'toabctl/noble-apparmor-feature-6.11-lp2098306' into ubuntu/noble
* toabctl/noble-apparmor-feature-6.11-lp2098306:
  Add debian/changelog entry
  Add 6.11 kernel apparmor features' preseeds
2025-02-21 14:37:33 +05:30
Michael Hudson-Doyle
a3363733ff releasing package livecd-rootfs version 24.04.86 2025-02-17 11:32:33 +13:00
Michael Hudson-Doyle
46fae973d7 Do not build HWE kernel layer on RISC-V as there is no HWE kernel there. 2025-02-17 11:31:54 +13:00
Dan Bungert
5e36233d82 releasing package livecd-rootfs version 24.04.85 2025-02-13 07:48:03 -07:00
Thomas Bechtold
519832022e
Add debian/changelog entry 2025-02-13 12:56:37 +01:00
Utkarsh Gupta
61042515b3
Add 6.11 kernel apparmor features' preseeds 2025-02-13 12:22:16 +01:00
Dan Bungert
2a9992ad7d build: fix FLAVOUR set for lowlatency 2025-02-12 20:00:08 -07:00
Utkarsh Gupta
de15c55ef0 Update d/ch for 24.04.84 release 2025-02-13 03:16:44 +05:30
Utkarsh Gupta
d02ab9bc0e Bump HWE kernel track to 24.04 for ubuntu-core-desktop 2025-02-13 03:16:44 +05:30
Florent 'Skia' Jacquet
ddfb468b42 Enable the HWE stack for 24.04.2
This change was overlooked, thanks to a combination of Jira
checklist items + inexperienced team members + quite late
landing of the HWE stack.

LP: #2098105
2025-02-13 03:16:14 +05:30
Florent 'Skia' Jacquet
2af06de671 kylin: indentation fix 2025-02-12 15:17:28 +01:00
Didier Roche
5545bf057e
releasing package livecd-rootfs version 24.04.83 2025-01-23 15:37:42 +01:00
Didier Roche
4e52b33e45
Update reference to wsl-setup now in /usr/lib/wsl/
Microsoft expects this binary to be under that path.
2025-01-23 14:22:43 +01:00
Didier Roche
48338fc76a
Create wsl-distribution.conf for WSL images
This file is required in the new Microsoft WSL package format.

Co-authored-by: Carlos Nihelton <carlos.santanadeoliveira@canonical.com>
2025-01-23 14:13:36 +01:00
Didier Roche
c1e2deee9f
Create livecd-roots tarball as a .wsl extension
Co-authored-by: Carlos Nihelton <carlos.santanadeoliveira@canonical.com>
2025-01-23 14:13:36 +01:00
Didier Roche
c954240293
Keep a single wsl rootfs upgrade policy
We are removing our different variants of wsl rootfs with the new
Microsoft format. We only keep one following the distribution policy:
- lts to lts
- intermediate release to next one

Co-authored-by: Carlos Nihelton <carlos.santanadeoliveira@canonical.com>
2025-01-23 14:13:31 +01:00
Loïc Minier
a81a1c20c7 Add support for arm64+tegra-jetson flavor. (LP: #2091392) 2024-12-13 17:54:01 +00:00
Utkarsh Gupta
a2058724c4 Update d/ch for 24.04.81 release 2024-11-20 15:44:45 +05:30
Utkarsh Gupta
6047e22319 Introduce unminimize as a package in OCI images (LP: #2078583)
With having unminimize split out from livecd-rootfs, we should
re-introduce it as a package for, at least, Noble so that it's
not seen as a regression. From 24.10 and onward, we're going to
drop it altogether.
2024-11-20 15:43:41 +05:30
John Chittum
9a970b2ca2
changelog 2024-11-07 08:12:50 -05:00
John Chittum
b7c2cf45b1
fix(buildd): create buildd homedir
LP:2083240

starting in noble, adduser no longer creates a homedir for system users.
The buildd user then does not have a home directory, causing snaps to be
unable to run, as well as possibly other issues from a missing assumed
homedir. Explicitly create /home/buildd
2024-11-06 07:33:51 -05:00
Thomas Bechtold
70d7c43d6a
Add debian/changelog entry 2024-10-18 13:55:39 +02:00
Thomas Bechtold
d1ca48bdc4
feat(apparmor): Add policy:permstable32 feature to 6.8 kernel (LP: #2084698)
Failing CPC tests show that the preseeded apparmor features don't
include policy:permstable32 for the 6.8 kernel. This change adds the
feature preseed with values based on a successfully booted instance.
2024-10-18 13:53:20 +02:00
John Chittum
0b2af5aa60 add changelog entry 2024-09-26 17:04:57 +12:00
John Chittum
377617b946 feat(ubuntu-cpc): sbom generation everywhere
patch create_manifest to produce an sbom when called by an ubuntu-cpc
project. Patch all the ubuntu-cpc hooks and series files to include the
newly generated manifests, filelists, and sboms. Generates a number of
new artifacts in the builds. the snap utilized, cpc-sbom, is an open
source repo and a provided via a hidden snap. there is no intention of
publisizing the snap or how we generate sboms, however partners require
the ability to audit if required.

defensively checks if the snap is already installed, in the case of
multiple hooks being called in a single build (thus sharing a build
host), and only if called in an ubuntu-cpc project.

(cherry picked from commit 7c7b7df89dc96169db1f255d6bba901ebb63a43c)
2024-09-26 17:04:35 +12:00
Michael Hudson-Doyle
d3ef751279 commit hotfix upload 2024-09-26 17:04:12 +12:00
Utkarsh Gupta
9ffb24c8f7 Add SRU bug in d/ch entry 2024-08-23 11:03:33 +05:30
Utkarsh Gupta
aa3481c960 Update d/ch for 24.04.77 release 2024-08-21 12:09:45 +05:30
Utkarsh Gupta
c8ee3dddba Use packaged unminimize in the ubuntu-server images
unminimize is currently present at /usr/local/sbin/unminimize,
which is spit out by livecd-rootfs currently. We'd like to switch
that to use the packaged unminimize, which will be at
/usr/bin/unminimize instead.

(cherry picked from commit 7535bf7bc729b52d28a0a5a44b3aa8362ca9397d)
2024-08-21 12:06:39 +05:30
Utkarsh Gupta
0f837b9431 Drop unminimize spit out by livecd-rootfs
And prefer the one that is packaged separately as
src:unminimize, which installs the package in
/usr/bin/unminimize

(cherry picked from commit 34482819f0d0078f834b052c308b371bedd621d0)
2024-08-21 12:06:20 +05:30
Michael Hudson-Doyle
47c1a539d6 releasing package livecd-rootfs version 24.04.76 2024-08-21 16:14:10 +12:00
Michael Hudson-Doyle
9441bbdfb5 Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer ISO for now. 2024-08-21 15:58:08 +12:00
Michael Hudson-Doyle
5a4991ade3 add reference to SRU bug to changelog 2024-08-08 16:50:13 +12:00
Michael Hudson-Doyle
a99b788ebc releasing package livecd-rootfs version 24.04.75 2024-07-30 16:35:50 +12:00
Michael Hudson-Doyle
0df4234c28 Add 'ubuntu-core-installer' project.
The ubuntu-core-installer image is an installer that installs ubuntu
core. The environment the installer runs in is similar to the server
installer but it has a source catalog entry that points to the model
created in ubuntu-core-installer/hooks/05-prepare-image.binary, which
subiquity knows how to install.
2024-07-25 17:26:22 +12:00
Łukasz 'sil2100' Zemczak
2215660a7d releasing package livecd-rootfs version 24.04.74 2024-07-24 16:17:29 +01:00
Heinrich Schuchardt
1da6867784 riscv64: preinstalled server image for Microchip PIC64GX Curiosity Kit
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2024-07-24 11:26:05 +02:00
Łukasz 'sil2100' Zemczak
69b47ce2fe releasing package livecd-rootfs version 24.04.73 2024-07-11 13:17:09 +02:00
Łukasz 'sil2100' Zemczak
bb44f093c9 Backport the qcow2 ubuntu-core image generation for LXD support. 2024-07-11 13:16:40 +02:00
Philip Roche
a0dea8f6e2
d/ch change to upload 24.04.72 noble 2024-06-25 12:23:43 +01:00
Philip Roche
d9e444988d
Merge bugfix/LP-2069828-restore-unminimize-during-server-build-noble into ubuntu/noble [a=philroche] [r=gjolly,utkarsh]
fix: Revert removal of unminimize call in server builds (LP: #2069828)

There was a change made by me in https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/466388
as part of LP: #2066905 to remove references to LXD in the unminimize scripts
but I also removed the calls to `unminimize` in error.

This still needs to run but without any references to LXD which no longer
needs to be `unminimized` via snap installation.

(cherry picked from commit f574fc8200d8a4c7837288c5d2aa1e515137bb55)

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/468088
2024-06-25 12:19:00 +01:00
Philip Roche
62a80ac00a
fix: Revert removal of unminimize call in server builds (LP: #2069828)
There was a change made by me in https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/466388
as part of LP: #2066905 to remove references to LXD in the unminimize scripts
but I also removed the calls to `unminimize` in error.

This still needs to run but without any references to LXD which no longer
needs to be `unminimized` via snap installation.

(cherry picked from commit f574fc8200d8a4c7837288c5d2aa1e515137bb55)
2024-06-24 17:26:07 +01:00
Heinrich Schuchardt
05933ff83f riscv64: use earlycon=sbi on command line
With current kernel we need to specify the SBI driver
for the early console to work.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2024-06-07 16:21:32 +02:00
Philip Roche
10d4a04d14
Merge bugfix/noble-remove-files-added-during-incorect-merge-conflict-resolution into ubuntu/noble [a=philroche] [r=brian-murray]
fix: Remove .patch files and livecd-rootfs symlink committed in error as part of merge commit.

Apologies. Trying to do too many things at once

This reverts changes added in error in commit 639f04b7

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/466885
2024-06-04 18:42:12 +01:00
Philip Roche
d72ae0de70
fix: Remove .patch files and livecd-rootfs symlink committed in error as part of merge commit.
Apologies. Trying to do too many things at once

This reverts changes added in error in commit 639f04b7
2024-06-04 18:33:45 +01:00
Philip Roche
bfb829c64d fix: Remove .idea pycharm directories and files committed in error as part of merge commit.
Apologies. Trying to do too many things at once
2024-05-27 12:40:56 +01:00
Philip Roche
13ec478feb d/ch change to upload 24.04.71 noble 2024-05-27 12:06:44 +01:00
Philip Roche
639f04b7b9 Merge feature/re-enable-noble-hyperv-desktop-builds-noble into ubuntu/noble [a=philroche] [r=mwhudson,utkarsh]
feat: Re-enable ability to build HyperV desktop images (LP: #2064280)

We have not built Hyperv desktop images since Jammy and with the re-introduction of
HyperV for Noble we have encountered build issues caused by refactoring and removals
of code assumed to be redundant but the HyperV desktop images were actually using
these code paths.

This is a backport/SRU from oracular.

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/466385

# Conflicts:
#	debian/changelog
2024-05-27 12:06:31 +01:00
Philip Roche
073d7e0404 d/ch change to upload 24.04.70 noble 2024-05-27 11:11:12 +01:00
Philip Roche
1f40b60606 Merge bugfix/lxd-no-longer-seeded-unminimize-noble into ubuntu/noble [a=philroche] [r=sdeziel,utkarsh,vorlon]
fix: No longer install LXD snap in unminimize script (LP: #2066905)

The LXD snap is no longer seeded in any images since Noble+ so the LXD related unminimize logic in
./live-build/auto/build?h=ubuntu/noble and ./live-build/ubuntu-server/hooks/01-unminimize.chroot_early
 is no longer required.

lxd-installer can remain installed.

This is a backport/SRU from oracular

(cherry picked from commit 46c19dfa913c133042d62e0caa2d2d526cd9bb7f)

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/466388
2024-05-27 11:10:05 +01:00
Philip Roche
5507ca8d83 fix: No longer install LXD snap in unminimize script (LP: #2066905)
The LXD snap is no longer seeded in any images since Noble+ so the LXD related unminimize logic in
./live-build/auto/build?h=ubuntu/noble and ./live-build/ubuntu-server/hooks/01-unminimize.chroot_early
 is no longer required.

lxd-installer can remain installed.

(cherry picked from commit 46c19dfa913c133042d62e0caa2d2d526cd9bb7f)
2024-05-24 15:48:21 +01:00
Philip Roche
49a14274d1 d/ch update for 24.04.70 to re-enable ability to build HyperV desktop images (LP: #2064280) 2024-05-24 15:34:40 +01:00
Philip Roche
5f59eec085 fix(Hyperv Desktop): remove redundant case statement match ubuntu
`ubuntu` will never match `${PROJECT:-}:${SUBPROJECT:-}` cases statement and can be safely removed.

(cherry picked from commit 0945c40fb2bb067d86d496b7b40bdae89123124c)
2024-05-24 15:31:21 +01:00
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
Phil Roche
fa351ac77b fix(HyperV desktop): Re-enable ability to build HyperV desktop images (LP: #2064280)
We have not built Hyperv desktop images since Jammy and with the re-introduction of HyperV for Noble we have encountered build issues caused by refactoring and removals of code assumed to be redundant but the HyperV desktop images were actually using these code paths.

In bbedffe6 we split the building of cloud images and non cloud to using an ddisk-image-uefi.binary and disk-image-uefi-non-cloud.binary respectively. In e38264ca there was a change which meant that any attempt to build hyperv images would result in incorrect disk size and incorrect disk label.

This has been fixed by ensuring that the ubuntu:desktop-preinstalled $PROJECT:$SUBPROJECT matches and sets the correct disk size and correct disk label.

A change in 76d79466 changed the logic of how the image size for amd64 images were being set. This overrode the sizes set for the desktop images incorrectly.

This commit ensures that any desktop image being created uses the correct image size.

(cherry picked from commit 48aed401949637ac314e59de996ccab19d5eefcd)
2024-05-24 15:30:38 +01:00
128 changed files with 1028 additions and 1588 deletions

1
debian/.gitignore vendored
View File

@ -1 +0,0 @@
files

586
debian/changelog vendored
View File

@ -1,319 +1,77 @@
livecd-rootfs (25.10.17) questing; urgency=medium
livecd-rootfs (24.04.93) noble; urgency=medium
[ Tim Andersson ]
* Enable ubuntu-dangerous desktop builds (desktop images
with all snaps on edge).
* Remove temporary snap overrides.
* Import latest 25.10 classic model (LP: #2120473)
* Import 25.10 dangerous model with all snap channels corrected.
* Add 6.14 kernel apparmor features' preseeds. (LP: #2116199)
-- Utkarsh Gupta <utkarsh@ubuntu.com> Wed, 27 Aug 2025 18:57:13 +0530
-- Bryan Alexander <bryan.alexander@canonical.com> Thu, 17 Jul 2025 11:52:40 -0700
livecd-rootfs (25.10.16) questing; urgency=medium
livecd-rootfs (24.04.92) noble; urgency=medium
* Put the uc20-style system seed for TPM backed FDE in the live layer.
* Temporarily revert the 24.04.90 changes. We wish to validate only
24.04.91 for Ubuntu 24.04.3 point release.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 13 Aug 2025 10:34:39 +1200
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 31 Jul 2025 11:27:41 -0600
livecd-rootfs (25.10.15) questing; urgency=medium
livecd-rootfs (24.04.91) noble; urgency=medium
* Add missing components to 6.14 kernel apparmor features' preseeds.
(LP: #2116199)
* Fix lowlatency kernel flavour name (LP: #2119012)
-- Bryan Alexander <bryan.alexander@canonical.com> Thu, 17 Jul 2025 13:27:17 -0700
-- Juerg Haefliger <juerg.haefliger@canonical.com> Wed, 30 Jul 2025 17:36:25 +0200
livecd-rootfs (25.10.14) questing; urgency=medium
livecd-rootfs (24.04.90) noble; urgency=medium
[ Didier Roche-Tolomelli ]
[ Tim Andersson ]
[ Daniel Bungert ]
* desktop TPMFDE: move snaps back to stable channels
[ Chad Smith ]
* Override cloud-init.service in /etc so as to not invalidate debsums
(LP: #2069391)
* Update the overridden copy of cloud-init.service
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 07 Aug 2025 16:21:32 -0600
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 22 Jul 2025 15:50:34 -0600
livecd-rootfs (25.10.13) questing; urgency=medium
livecd-rootfs (24.04.89) noble; urgency=medium
[ Olivier Gayot ]
* Build ubuntu-server with multipath-tools-boot installed, so that the
multipath stack ends up present in the initramfs.
The LVM stack is already present in the initramfs of the installer. And
since kinetic, the /dev/mapper entries for LVM devices are created during
the initramfs phase. This is a problem when we have LVM on top of a
multipath disk because LVM ends up creating /dev/mapper entries out of
/dev/sdX (or /dev/sdXpY) devices, not out of /dev/mapper/mpatha as it
should. Adding the multipath stack in the initramfs gives multipath a
chance to take ownership of /dev/sdX (or /dev/sdXpY) devices before LVM
does (LP: #2080474).
* desktop: Remove some cruft referencing the subiquity snap, which can
result in 'error: snap "subiquity" is not installed' messages being
printed on the terminal. (LP: #2083554)
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 24 Jul 2025 17:37:33 -0600
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 30 Apr 2025 15:27:46 -0600
livecd-rootfs (25.10.12) questing; urgency=medium
livecd-rootfs (24.04.88) noble; urgency=medium
[ Zygmunt Krynicki ]
* Use snap wait system seed.loaded to wait for snapd (LP: #2114923)
[ Dennis Loose ]
[ Didier Roche-Tolomelli ]
* Allow the ubuntu-desktop-installer to request snap seeding state
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Tue, 15 Jul 2025 16:30:41 +0200
livecd-rootfs (25.10.11) questing; urgency=medium
* Fix installer startup to wait for snapd to be preseeded first
(LP: #2114923)
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Fri, 11 Jul 2025 14:57:56 +0200
livecd-rootfs (25.10.10) questing; urgency=medium
* risc-v cloud images: enable cpc fixes for riscv64
-- Adriano Cordova <adriano.cordova@canonical.com> Tue, 01 Jul 2025 09:11:16 -0400
livecd-rootfs (25.10.9) questing; urgency=medium
* desktop and server: read $SUBARCH to allow the use of nvidia's kernel
instead of generic (LP: #2109822)
-- Antoine Lassagne <antoine.lassagne@canonical.com> Tue, 17 Jun 2025 22:23:11 +1200
livecd-rootfs (25.10.8) questing; urgency=medium
[ Didier Roche-Tolomelli ]
* desktop: use snapd from edge
* desktop: tpmfde image use desktop-security-center and firmware-updater
from edge
[ Dan Bungert ]
* lb_binary_layered: try #2 to fix mtimes in layered squashfses. (LP2107332)
Constrain mtime sync to the current upperdir so that files in lower layers
are not redundantly included.
* server: fix failure to process the hwe kernel layer due to multiple
kernels being present (LP: #2112501)
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 13 Jun 2025 12:00:20 -0600
livecd-rootfs (25.10.7) questing; urgency=medium
* revert 25.10.6 due to duplicated snaps
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 10 Jun 2025 07:55:40 -0600
livecd-rootfs (25.10.6) questing; urgency=medium
* lb_binary_layered: fix mtimes in layered squashfses. (LP: #2107332)
Failing to preserve mtime causes unnecessary python pyc rebuilds due to
mtime mismatch, and it's generally strange that reinstalling a package
that is already installed changes the files on the system (minus
intentional differences such as what's going on in the minimized install
source).
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 30 May 2025 17:05:15 -0600
livecd-rootfs (25.10.5) questing; urgency=medium
* desktop: TPMFDE snapd from latest/edge
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 28 May 2025 10:27:47 -0600
livecd-rootfs (25.10.4) questing; urgency=medium
* desktop: TPMFDE kernel from 25.10/candidate
-- Dan Bungert <daniel.bungert@canonical.com> Sun, 25 May 2025 23:18:59 -0600
livecd-rootfs (25.10.3) questing; urgency=medium
* desktop: update TPMFDE model and don't skip 020-ubuntu-enhanced-sb.binary.
(LP: #2110195) Temporarily use the model that allows overriding snap
channels so we can get matching snaps.
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 23 May 2025 12:59:40 -0600
livecd-rootfs (25.10.2) questing; urgency=medium
* desktop: skip 020-ubuntu-enhanced-sb.binary until a matching kernel is
ready for snapd 2.68.x
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 06 May 2025 08:24:10 +0200
livecd-rootfs (25.10.1) questing; urgency=medium
* desktop: no longer involve cloud-init in early networking (LP: #2107225)
* server: provide network config direct to netplan
* server: update default netplan config for IPv6 autoconfiguration &
connectivity
-- Dan Bungert <daniel.bungert@canonical.com> Mon, 28 Apr 2025 09:53:34 -0600
livecd-rootfs (25.04.26) plucky; urgency=medium
* cpc: Restore UseDomains=true in cloud images (LP: #2106729)
-- Tomáš Virtus <tomas.virtus@canonical.com> Thu, 10 Apr 2025 13:07:25 +0000
livecd-rootfs (25.04.25) plucky; urgency=medium
* live-build/auto/build: Use --workdir in ubuntu-image to avoid filling
tmpfs-based /tmp (LP: #2103735)
-- Dave Jones <dave.jones@canonical.com> Thu, 20 Mar 2025 17:22:47 +0000
livecd-rootfs (25.04.24) plucky; urgency=medium
* desktop: update TPMFDE model to move pc-kernel to channel 25.04/stable.
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 13 Mar 2025 17:17:30 -0600
livecd-rootfs (25.04.23) plucky; urgency=medium
* Add 6.14 kernel apparmor features' preseeds. (LP: #2102120)
-- Jess Jang <jess.jang@canonical.com> Wed, 12 Mar 2025 21:08:31 -0500
livecd-rootfs (25.04.22) plucky; urgency=medium
* server: leave the initrd.img symlink, we want that later for probably
several reasons but at least for LP: #2101831
* desktop: update TPMFDE model for 25.04.
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 11 Mar 2025 09:16:03 -0600
livecd-rootfs (25.04.21) plucky; urgency=medium
* With subiquity builds, setup install-sources to offer bridge kernel.
* Add USE_BRIDGE_KERNEL to make it easier to control in the future.
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 05 Mar 2025 08:18:54 -0700
livecd-rootfs (25.04.20) plucky; urgency=medium
[ Adriano Cordova ]
* risc-v: directly copy device trees to /boot/dtb. (LP: #2092205)
* riscv: add SUBARCH 'jh7110'. (LP: #2099993)
[ Michael Hudson-Doyle ]
* In ubuntu-server builds, install the first kernel in the base layer, not
the "ga" kernel (which may not be installed at all, as is the case in e.g.
the arm64+largemem builds).
* Again in ubuntu-server builds, configure LAYERFS_PATH in the kernel layer
and ensure the initrd is freshly regenerated in that layer. LAYERFS_PATH
was being set to the layer below the kernel layer, which meant that the
live session did not get access to all the modules in the case that the
kernel had not been installed in the base layer, which in turn means that
installs fail. (LP: #2100148)
* While we're at it, delete any initrd from any other layer than a kernel
layer, as they just waste space on the ISO.
-- Adriano Cordova <adriano.cordova@canonical.com> Mon, 10 Feb 2025 10:40:23 -0300
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 27 Feb 2025 20:34:01 +1300
livecd-rootfs (24.04.87) noble; urgency=medium
livecd-rootfs (25.04.19) plucky; urgency=medium
* Add 6.11 kernel apparmor features' preseeds. (LP: #2098306)
* add cpc-sbom to create_manifest calls to generate sboms (LP: #2077105)
-- Thomas Bechtold <thomas.bechtold@canonical.com> Thu, 13 Feb 2025 12:22:41 +0100
-- Thomas Bechtold <thomasbechtold@jpberlin.de> Tue, 25 Feb 2025 13:20:49 +0100
livecd-rootfs (24.04.86) noble; urgency=medium
livecd-rootfs (25.04.18) plucky; urgency=medium
* Do not build HWE kernel layer on RISC-V as there is no HWE kernel there.
(LP: #2098622)
[ Michael Hudson-Doyle ]
* Pre-emptively include the override to not try to build HWE kernel layer in
post .2 server riscv64 ISOs.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 17 Feb 2025 11:32:19 +1300
[ Simon Quigley ]
* Move from http://ppa.launchpad.net to https://ppa.launchpadcontent.net
when specifying EXTRA_PPAS.
* Update debhelper compat to 13, no changes needed.
* Make the package completely Lintian-clean except for no-dep5-copyright.
* Update Standards-Version to 4.7.0, no changes needed.
* Add support for multiple pools (/var/lib/{livefs,preinstalled}-pool/).
livecd-rootfs (24.04.85) noble; urgency=medium
[ Simon Poirier ]
* increase ubuntu-cpc ppc64el disk size to 2.4G
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 20 Feb 2025 10:24:04 +1300
livecd-rootfs (25.04.17) plucky; urgency=medium
[ Dan Bungert ]
* Fix build failure when using lowlatency-hwe-24.04, as ubuntustudio does.
(LP: #2098105)
[ Michael Hudson-Doyle ]
* live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary: Drop the
assumption that the uncompressed part of the initrd is unpacked to a
directory called "main".
* live-build/ubuntu-mini-iso/hooks/01-mini-iso.chroot_early: Fix paths that
should have been adjusted when code moved from binary to chroot hook.
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 12 Feb 2025 18:39:48 -0700
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 14 Feb 2025 17:25:29 +1300
livecd-rootfs (24.04.84) noble; urgency=medium
livecd-rootfs (25.04.16) plucky; urgency=medium
[ Florent 'Skia' Jacquet ]
* Enable the HWE stack for 24.04.2. (LP: #2098105)
* buildd: add udev to buildd images to fix networking issue. (LP: #2092196)
[ Utkarsh Gupta ]
* Bump HWE kernel track to 24.04 for ubuntu-core-desktop.
-- Simon Poirier <simon.poirier@canonical.com> Thu, 13 Feb 2025 13:44:02 -0500
-- Utkarsh Gupta <utkarsh@ubuntu.com> Thu, 13 Feb 2025 03:15:12 +0530
livecd-rootfs (25.04.15) plucky; urgency=medium
* Add 6.12 kernel apparmor features' preseeds.
-- Thomas Bechtold <thomas.bechtold@canonical.com> Thu, 13 Feb 2025 12:14:33 +0100
livecd-rootfs (25.04.14) plucky; urgency=medium
* Restore the default-layer.conf file in the initrd (LP: #2097838)
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 11 Feb 2025 08:21:56 -0700
livecd-rootfs (25.04.13) plucky; urgency=medium
* install-sources: quote default kernel argument.
* ubuntu-core-installer: update install-sources.yaml with kernel.
-- Chris Peterson <chris.peterson@canonical.com> Wed, 05 Feb 2025 17:43:34 -0800
livecd-rootfs (25.04.12) plucky; urgency=medium
* Stop producing a rootfs tarball for the ubuntu-mini-iso builds.
* Move configuration of casper in ubuntu-serve:live builds to a "chroot
early" hook for the installer layer and remove the now unnecessary
update-initramfs from the binary hook that breaks because mkinitramfs
now requires that /sys is mounted. (LP: #2097280)
* Similar changes for ubuntu-mini-iso build.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 05 Feb 2025 15:26:13 +1300
livecd-rootfs (25.04.11) plucky; urgency=medium
[ Heinrich Schuchardt ]
* riscv: copy device trees dtb/ in ESP
[ Michael Hudson-Doyle ]
* Allow snapd to re-exec in installer environment (the issues between snapd,
overlayfs and apparmer that meant re-execing caused problems were fixed in
snapd a long time ago).
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 29 Jan 2025 08:51:49 +1300
livecd-rootfs (25.04.10) plucky; urgency=medium
* riscv: copy device trees to the ESP. Fixes (LP: #2095415)
-- Adriano Cordova <adriano.cordova@canonical.com> Tue, 21 Jan 2025 10:38:54 -0300
livecd-rootfs (25.04.9) plucky; urgency=medium
* Move reference wsl-setup script to /usr/lib/wsl/
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Wed, 22 Jan 2025 10:17:56 +0100
livecd-rootfs (25.04.8) plucky; urgency=medium
* risc-v: directly copy device trees to /boot/dtbs (LP: #2092205)
-- Adriano Cordova <adriano.cordova@canonical.com> Thu, 19 Dec 2024 10:42:57 -0300
livecd-rootfs (25.04.7) plucky; urgency=medium
livecd-rootfs (24.04.83) noble; urgency=medium
[ Carlos Nihelton ]
[ Didier Roche-Tolomelli ]
@ -322,263 +80,105 @@ livecd-rootfs (25.04.7) plucky; urgency=medium
- Create livecd-roots tarball as a .wsl extension
- Create wsl-distribution.conf for WSL images
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Mon, 09 Dec 2024 14:29:37 +0100
-- Didier Roche-Tolomelli <didrocks@ubuntu.com> Thu, 23 Jan 2025 14:22:54 +0100
livecd-rootfs (25.04.6) plucky; urgency=medium
livecd-rootfs (24.04.82) noble; urgency=medium
* Refer to LB_DISTRIBUTION, not SUITE, in the ubuntu-mini-iso binary hook.
* Add support for arm64+tegra-jetson flavor. (LP: #2091392)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 06 Dec 2024 18:59:35 +1300
-- Remy Martin <remy.martin@canonical.com> Fri, 13 Dec 2024 11:53:08 +0100
livecd-rootfs (25.04.5) plucky; urgency=medium
livecd-rootfs (24.04.81) noble; urgency=medium
* Fix ubuntu-mini-iso build, by using script from debian-cd to create a
bootable ISO rather than the now deleted cd-boot-images-amd64 package.
* Introduce unminimize as a package in OCI images. (LP: #2078583)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 04 Dec 2024 13:33:53 +1300
-- Utkarsh Gupta <utkarsh@ubuntu.com> Wed, 20 Nov 2024 15:43:55 +0530
livecd-rootfs (25.04.4) plucky; urgency=medium
[ Rémy Martin ]
* Add support for arm64+tegra-jetson flavor to disambiguate from the
NVIDIA IGX builds.
-- Loïc Minier <loic.minier@ubuntu.com> Tue, 26 Nov 2024 13:41:05 +0000
livecd-rootfs (25.04.3) plucky; urgency=medium
* Switch Lubuntu to stacked squashfses, and split apart the common
functionality to avoid Subiquity-specific commands.
* Add optional Dracut support for installed images, enable it for Lubuntu.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 23 Nov 2024 13:52:09 -0600
livecd-rootfs (25.04.2) plucky; urgency=medium
livecd-rootfs (24.04.80) noble; urgency=medium
* Explicitly create home directory for buildd system user to avoid issues
with installing and running snaps. (LP: #2083240)
with installing and running snaps. (LP: #2083240)
-- jchittum <john.chittum@canonical.com> Wed, 06 Nov 2024 07:40:42 -0500
-- jchittum <john.chittum@canonical.com> Wed, 06 Nov 2024 07:43:40 -0500
livecd-rootfs (25.04.1) plucky; urgency=medium
livecd-rootfs (24.04.79) noble; urgency=medium
* Add support for install-sources version: 2, which handles bridge kernels.
* Add apparmor policy permstable32 missing component (LP: #2084698)
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 17 Oct 2024 08:22:38 -0600
-- Thomas Bechtold <thomas.bechtold@canonical.com> Fri, 18 Oct 2024 13:54:51 +0200
livecd-rootfs (24.10.27) oracular; urgency=medium
livecd-rootfs (24.04.78) noble; urgency=medium
* Set UBUNTU_STORE_COHORT_KEY="+" to prepare-image to make sure we simply
use the latest snap versions regardless of phasing state.
* add cpc-sbom to create_manifest calls to generate sboms (LP: #2077105)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 08 Oct 2024 13:06:10 +0100
-- jchittum <john.chittum@canonical.com> Mon, 26 Aug 2024 14:15:05 -0400
livecd-rootfs (24.10.26) oracular; urgency=medium
* Use generic kernel flavor for Nezha D1 and LicheeRV Dock.
-- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Fri, 04 Oct 2024 10:30:28 +0200
livecd-rootfs (24.10.25) oracular; urgency=medium
* Update the model used for TPM FDE installs, yet again.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 04 Oct 2024 12:21:38 +1300
livecd-rootfs (24.10.24) oracular; urgency=medium
* desktop: Remove some cruft referencing the subiquity snap, which can
result in 'error: snap "subiquity" is not installed' messages being
printed on the terminal. (LP: #2083554)
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 02 Oct 2024 10:13:41 -0600
livecd-rootfs (24.10.23) oracular; urgency=medium
* Update the model used for TPM FDE installs, again, hopefully working this
time.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 02 Oct 2024 19:06:50 +1300
livecd-rootfs (24.10.22) oracular; urgency=medium
* Revert "Update the model used for TPM FDE installs."
(to unblock apparmor fixes for cloud images)
-- Utkarsh Gupta <utkarsh@ubuntu.com> Mon, 30 Sep 2024 16:19:22 +0530
livecd-rootfs (24.10.21) oracular; urgency=medium
[ Utkarsh Gupta ]
* Add 6.11 kernel apparmor features' preseeds.
[ Michael Hudson-Doyle ]
* Update the model used for TPM FDE installs.
-- Utkarsh Gupta <utkarsh@ubuntu.com> Thu, 19 Sep 2024 19:42:24 +0530
livecd-rootfs (24.10.20) oracular; urgency=medium
[ Chad Smith ]
* Refresh cloud-init service override for updated service file name and
ordering fix. (LP: #2081325)
-- Dan Bungert <daniel.bungert@canonical.com> Fri, 20 Sep 2024 12:36:12 -0600
livecd-rootfs (24.10.19) oracular; urgency=medium
* live-server and desktop: disable kdump-tools only in the live layer.
-- Chris Peterson <chris.peterson@canonical.com> Tue, 17 Sep 2024 21:11:15 -0700
livecd-rootfs (24.10.18) oracular; urgency=medium
* live-server and desktop: disable kdump-tools in the minimal layer
to allow the installer to decide when to enable it (LP: #2077990).
-- Chris Peterson <chris.peterson@canonical.com> Fri, 13 Sep 2024 09:08:33 -0700
livecd-rootfs (24.10.17) oracular; urgency=medium
* desktop and subiquity-using flavors: install the kernel in the minimal
layer (LP 2080272)
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 12 Sep 2024 15:30:34 -0600
livecd-rootfs (24.10.16) oracular; urgency=medium
* live-server: fix issue where the kernel was not actually placed in the
minimal layer
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 11 Sep 2024 12:30:35 -0600
livecd-rootfs (24.10.15) oracular; urgency=medium
* live-server: install the kernel in the minimal layer (LP: #2080272)
-- Dan Bungert <daniel.bungert@canonical.com> Tue, 10 Sep 2024 12:42:33 -0600
livecd-rootfs (24.10.14) oracular; urgency=medium
[ Sergio Costas ]
* Switch ubuntu-core-desktop project to be a subproject of the
ubuntu-core-installer project.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 10 Sep 2024 16:11:32 +1200
livecd-rootfs (24.10.13) oracular; urgency=medium
* Fix autopkgtest issue where /tmp mounted with nodev is used as a working
directory, which understandably causes problems for device node creation.
(LP: #2078980)
-- Dan Bungert <daniel.bungert@canonical.com> Wed, 04 Sep 2024 14:27:27 -0600
livecd-rootfs (24.10.12) oracular; urgency=medium
livecd-rootfs (24.04.77.1) noble; urgency=medium
* Hotfix upload outside of git history, real change from 24.04.79.
* Update ubuntu-classic-2404-amd64 model in ubuntu hooks. (LP: #2077899)
-- Chris Peterson <chris.peterson@canonical.com> Mon, 26 Aug 2024 17:03:28 -0700
-- Chris Peterson <chris.peterson@canonical.com> Mon, 26 Aug 2024 16:57:12 -0700
livecd-rootfs (24.10.11) oracular; urgency=medium
livecd-rootfs (24.04.77) noble; urgency=medium
[ Simon Poirier ]
* disk-image-uefi: Fix regression with partition sizing on arm.
* Drop unminimize spit out by livecd-rootfs. (LP: #2077695)
* Use packaged unminimize in the ubuntu-server images.
-- Utkarsh Gupta <utkarsh@ubuntu.com> Thu, 22 Aug 2024 04:58:46 +0530
-- Utkarsh Gupta <utkarsh@ubuntu.com> Wed, 21 Aug 2024 12:08:44 +0530
livecd-rootfs (24.10.10) oracular; urgency=medium
livecd-rootfs (24.04.76) noble; urgency=medium
* disk-image-uefi.binary: Shift down boot partition to 13 to support systems
which don't handle partition numbers higher than 15. (LP: #2072929)
* Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer
ISO for now. (LP: #2077495)
-- Simon Poirier <simon.poirier@canonical.com> Tue, 20 Aug 2024 18:57:57 -0400
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 21 Aug 2024 16:13:58 +1200
livecd-rootfs (24.10.9) oracular; urgency=medium
livecd-rootfs (24.04.75) noble; urgency=medium
[ Cody Shepherd ]
* fix: remove ec2-version hook for cpc images.
* Add 'ubuntu-core-installer' project. (LP: #2076307)
-- Utkarsh Gupta <utkarsh@ubuntu.com> Wed, 14 Aug 2024 18:02:29 +0530
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 30 Jul 2024 16:35:31 +1200
livecd-rootfs (24.10.8) oracular; urgency=medium
[ Erich Eickmeyer ]
* Add minimal installation to Ubuntu Studio
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 25 Jul 2024 11:12:52 -0700
livecd-rootfs (24.10.7) oracular; urgency=medium
livecd-rootfs (24.04.74) noble; urgency=medium
* riscv64: preinstalled server image for Microchip PIC64GX Curiosity Kit
(LP: #2072956)
-- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Mon, 22 Jul 2024 14:51:25 +0200
-- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Mon, 08 Jul 2024 17:51:25 +0200
livecd-rootfs (24.10.6) oracular; urgency=medium
livecd-rootfs (24.04.73) noble; urgency=medium
[ Chad Smith ]
* Override cloud-init.service in /etc so as to not invalidate debsums
(LP: #2069391)
* Update the overridden copy of cloud-init.service
* Build qcow2 images for ubuntu-core LXD support (LP: #2072759).
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 18 Jul 2024 15:58:53 -0600
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 11 Jul 2024 13:15:43 +0200
livecd-rootfs (24.10.5) oracular; urgency=medium
[ Erich Eickmeyer ]
* Switch Ubuntu Studio to generic kernel
[ Zhaoxuan Zhai ]
* support config sector size in ubuntu-image
[ Łukasz 'sil2100' Zemczak ]
* Build qcow2 images for ubuntu-core LXD support.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 11 Jul 2024 12:57:54 +0200
livecd-rootfs (24.10.4) oracular; urgency=medium
[ Philip Roche ]
* Revert removal of unminimize call in server builds. (LP: #2069828)
[ Utkarsh Gupta ]
* Use packaged unminimize in the ubuntu-server images.
* Drop unminimize spit out by livecd-rootfs.
-- Utkarsh Gupta <utkarsh@ubuntu.com> Wed, 19 Jun 2024 22:02:39 +0530
livecd-rootfs (24.10.3) oracular; urgency=medium
livecd-rootfs (24.04.72) noble; urgency=medium
[ Heinrich Schuchardt ]
* riscv64: use earlycon=sbi on command line
[ Michael Hudson-Doyle ]
* Add 'ubuntu-core-installer' project.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 11 Jun 2024 11:51:14 +1200
livecd-rootfs (24.10.2) oracular; urgency=medium
[ Michael Hudson-Doyle ]
* Replace 'ubuntustudio-dvd' project with an almost identical 'ubuntustudio'
project.
* riscv64: use earlycon=sbi on command line (LP: #2068739)
[ Philip Roche ]
* No longer install LXD snap in unminimize script (LP: #2066905)
* Revert removal of unminimize call in server builds (LP: #2069828)
-- Philip Roche <phil.roche@canonical.com> Thu, 23 May 2024 14:11:57 +0100
-- Philip Roche <phil.roche@canonical.com> Mon, 24 Jun 2024 14:24:52 +0100
livecd-rootfs (24.10.1) oracular; urgency=medium
livecd-rootfs (24.04.71) noble; urgency=medium
* Re-enable ability to build HyperV desktop images (LP: #2064280)
-- Philip Roche <phil.roche@canonical.com> Mon, 27 May 2024 12:05:33 +0100
livecd-rootfs (24.04.70) noble; urgency=medium
[ Łukasz 'sil2100' Zemczak ]
* Add experimental support for building ubuntu-core-desktop installer images
(LP: #2063203)
[ Philip Roche ]
* Re-enable ability to build HyperV desktop images (LP: #2064280)
* No longer install LXD snap in unminimize script (LP: #2066905)
-- Philip Roche <phil.roche@canonical.com> Tue, 30 Apr 2024 17:58:43 +0100
-- Philip Roche <phil.roche@canonical.com> Fri, 24 May 2024 15:47:48 +0100
livecd-rootfs (24.04.69) noble; urgency=medium
@ -790,7 +390,7 @@ livecd-rootfs (24.04.43) noble; urgency=medium
grub updates in cloud images (LP: #2054103)
-- Philip Roche <phil.roche@canonical.com> Fri, 23 Feb 2024 13:54:57 +0000
livecd-rootfs (24.04.42) noble; urgency=medium
[ Sean Davis ]
@ -916,8 +516,8 @@ livecd-rootfs (24.04.27) noble; urgency=medium
livecd-rootfs (24.04.26) noble; urgency=medium
[ Steve Langasek ]
* Share live-build/ubuntu/hooks/020-ubuntu-live.chroot_early across
all flavors using new-style layered squashfs, removing need for
* Share live-build/ubuntu/hooks/020-ubuntu-live.chroot_early across
all flavors using new-style layered squashfs, removing need for
kernel commandline options in debian-cd.
[ dann frazier ]
@ -1049,7 +649,7 @@ livecd-rootfs (24.04.10) noble; urgency=medium
* Set C.UTF-8 locale in /etc/default/locale for all images; originally
intended to be landed in the cosmic cycle..
* Project name for Ubuntu Studio needs to be 'ubuntustudio-dvd'
throughout, not 'ubuntustudio'.
throughout, not 'ubuntustudio'.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 08 Dec 2023 15:07:41 -0800
@ -1128,7 +728,7 @@ livecd-rootfs (24.04.2) noble; urgency=medium
instead of /boot/vmlinuz. (LP: #2038957)
-- Philip Roche <phil.roche@canonical.com> Thu, 26 Oct 2023 17:56:00 +0100
livecd-rootfs (24.04.1) noble; urgency=medium
[ Steve Langasek ]

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
7

6
debian/control vendored
View File

@ -1,12 +1,10 @@
Source: livecd-rootfs
Section: devel
Priority: optional
Build-Depends: debhelper-compat (= 13)
Build-Depends: debhelper (>= 7)
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Standards-Version: 4.7.0
Standards-Version: 3.9.6
Vcs-Git: https://git.launchpad.net/livecd-rootfs -b ubuntu/master
Vcs-Browser: https://git.launchpad.net/livecd-rootfs
Rules-Requires-Root: no
Package: livecd-rootfs
Architecture: any

2
debian/copyright vendored
View File

@ -11,7 +11,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License with
your Ubuntu system, in /usr/share/common-licenses/GPL-2, or with the
your Ubuntu system, in /usr/share/common-licenses/GPL, or with the
livecd-rootfs source package as the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA.

1
debian/install vendored
View File

@ -4,4 +4,3 @@ get-ppa-fingerprint usr/share/livecd-rootfs
minimize-manual usr/share/livecd-rootfs
checkout-translations-branch usr/share/livecd-rootfs
update-source-catalog usr/share/livecd-rootfs
sync-mtime usr/share/livecd-rootfs

View File

@ -1,10 +0,0 @@
# This is expected and okay
livecd-rootfs: service-file-is-not-a-file [usr/share/livecd-rootfs/*.service]
livecd-rootfs: uses-dpkg-database-directly [usr/share/livecd-rootfs/live-build/lb_chroot_layered]
livecd-rootfs: package-contains-no-arch-dependent-files
# Developer documentation in an already-expected spot
livecd-rootfs: package-contains-documentation-outside-usr-share-doc [usr/share/livecd-rootfs/live-build/ubuntu-cpc/README.cpc.md]
# This is going to occur quite a bit; we're making a livefs
livecd-rootfs: repeated-path-segment * [*]

View File

@ -1,5 +0,0 @@
# This is expected and okay
livecd-rootfs source: absolute-symbolic-link-target-in-source * [live-build/*]
# The description indicates that it's not required in debhelper >= 13, which we have
livecd-rootfs source: override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS [debian/rules:*]

View File

@ -78,8 +78,7 @@ live_build_rootfs() {
echo ""
}
[ -d /adt ] || mkdir /adt
WORKDIR=$(mktemp -d -p /adt)
WORKDIR=$(mktemp -d)
trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR

View File

@ -1 +0,0 @@
0xffffff

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore

View File

@ -1 +0,0 @@
acquire send receive

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
1.2

View File

@ -1 +0,0 @@
create read write exec append mmap_exec link lock

View File

@ -1 +0,0 @@
sqpoll override_creds

View File

@ -1 +0,0 @@
create read write open delete setattr getattr

View File

@ -1 +0,0 @@
mount umount pivot_root

View File

@ -1 +0,0 @@
detached

View File

@ -1 +0,0 @@
userns_create

View File

@ -1 +0,0 @@
no

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
pciu&

View File

@ -1 +0,0 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp

View File

@ -1 +0,0 @@
file

View File

@ -1 +0,0 @@
0x000001

View File

@ -1 +0,0 @@
0x000003

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
0x000001

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
read trace

View File

@ -1 +0,0 @@
yes

View File

@ -1 +0,0 @@
allow deny audit quiet

View File

@ -1 +0,0 @@
cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime

View File

@ -1 +0,0 @@
hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost

View File

@ -20,7 +20,8 @@ fi
# Link output files somewhere launchpad-buildd will be able to find them.
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ] \
|| [ "$PROJECT" = "ubuntu-core-desktop" ]; then
# Use ubuntu-image instead (or as part) of live-build
export SNAPPY_STORE_NO_CDN=1
@ -46,11 +47,41 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# All the builds are finished now, exit
exit 0
elif [ "$PROJECT" = "ubuntu-core-desktop" ]; then
# Ubuntu Core Desktop payload image
# Special case for ubuntu-core-desktop - we need to call
# ubuntu-image twice, once for the core image payload and
# then for the actual image.
echo "Building the core image payload"
cd config/
/snap/bin/ubuntu-image snap $UBUNTU_IMAGE_PAYLOAD_ARGS \
-O output ubuntu-core-desktop*.model-assertion
mv output/*.img pc.img
xz -0 -T4 pc.img
rm -rf output/
# Prepare the source catalogue
cat install-sources-in.yaml | sed "s/@SIZE@/$(stat -c%s pc.img.xz)/g" > ../"$PREFIX".install-sources.yaml
# We need to rename the image file so that it can be pulled
# by the builder.
mv pc.img.xz ../"$PREFIX".img.xz
# We need to make sure the autoinstall file is also exported.
mv autoinstall.yaml ../"$PREFIX".autoinstall.yaml
# Useful to have the model-assertion exported as well.
mv ubuntu-core-desktop*.model-assertion ../"$PREFIX".model-assertion
# Important: return to the previous directory
cd ../
# Payload build finished, but now we need to build the rest with the
# usual live-build tools.
else
# Ubuntu classic preinstalled images
# --workdir is specified to avoid filling /tmp which is now a tmpfs
/snap/bin/ubuntu-image classic --verbose $UBUNTU_IMAGE_ARGS \
--workdir work -O output "$IMAGE_DEFINITION"
-O output "$IMAGE_DEFINITION"
# Since the output of the ubuntu-image call can vary based on what
# kind of an image we build, the safest bet is to 'export' all the
# artifacts from the output directory. The image definition file
@ -242,11 +273,10 @@ EOF
configure_universe
for POOL_DIR in preinstalled-pool livefs-pool; do
if [ -d chroot/var/lib/$POOL_DIR ]; then
cat > config/indices/apt.conf <<-EOF
if [ -d chroot/var/lib/preinstalled-pool ]; then
cat > config/indices/apt.conf <<-EOF
Dir {
ArchiveDir "chroot/var/lib/$POOL_DIR";
ArchiveDir "chroot/var/lib/preinstalled-pool";
OverrideDir "config/indices";
CacheDir "config/indices";
}
@ -261,11 +291,11 @@ Tree "dists/$LB_DISTRIBUTION"
Contents " ";
}
EOF
for component in $LB_PARENT_ARCHIVE_AREAS; do
mkdir -p chroot/var/lib/$POOL_DIR/dists/$LB_DISTRIBUTION/$component/binary-$LB_ARCHITECTURES
done
apt-ftparchive generate config/indices/apt.conf
cat << @@EOF > chroot/etc/apt/sources.list.d/$POOL_DIR.sources
for component in $LB_PARENT_ARCHIVE_AREAS; do
mkdir -p chroot/var/lib/preinstalled-pool/dists/$LB_DISTRIBUTION/$component/binary-$LB_ARCHITECTURES
done
apt-ftparchive generate config/indices/apt.conf
cat << @@EOF > chroot/etc/apt/sources.list.d/preinstalled-pool.sources
# This is a sources.list entry for a small pool of packages
# provided on your preinstalled filesystem for your convenience.
#
@ -274,41 +304,40 @@ EOF
# packages remotely instead.
#
Types: deb
URIs: file:/var/lib/$POOL_DIR/
URIs: file:/var/lib/preinstalled-pool/
Suites: $LB_DISTRIBUTION
Components: $LB_PARENT_ARCHIVE_AREAS
Signed-By: /etc/apt/keyrings/$POOL_DIR.gpg
Signed-By: /etc/apt/keyrings/preinstalled-pool.gpg
@@EOF
echo "Waiting on gnupg ("$GPG_PROCESS") to finish generating a key."
wait $GPG_PROCESS
echo "Waiting on gnupg ("$GPG_PROCESS") to finish generating a key."
wait $GPG_PROCESS
R_ORIGIN=$(lsb_release -i -s)
R_CODENAME=$(lsb_release -c -s)
R_VERSION=$(lsb_release -r -s)
R_PRETTYNAME=$(echo $R_CODENAME | sed -e 's/^\(.\)/\U\1/')
R_ORIGIN=$(lsb_release -i -s)
R_CODENAME=$(lsb_release -c -s)
R_VERSION=$(lsb_release -r -s)
R_PRETTYNAME=$(echo $R_CODENAME | sed -e 's/^\(.\)/\U\1/')
apt-ftparchive -o APT::FTPArchive::Release::Origin=$R_ORIGIN \
-o APT::FTPArchive::Release::Label=$R_ORIGIN \
-o APT::FTPArchive::Release::Suite=$R_CODENAME-local \
-o APT::FTPArchive::Release::Version=$R_VERSION \
-o APT::FTPArchive::Release::Codename=$R_CODENAME \
-o APT::FTPArchive::Release::Description="$R_ORIGIN $R_PRETTYNAME Local" \
release chroot/var/lib/$POOL_DIR/dists/$R_CODENAME/ \
> config/gnupg/Release
apt-ftparchive -o APT::FTPArchive::Release::Origin=$R_ORIGIN \
-o APT::FTPArchive::Release::Label=$R_ORIGIN \
-o APT::FTPArchive::Release::Suite=$R_CODENAME-local \
-o APT::FTPArchive::Release::Version=$R_VERSION \
-o APT::FTPArchive::Release::Codename=$R_CODENAME \
-o APT::FTPArchive::Release::Description="$R_ORIGIN $R_PRETTYNAME Local" \
release chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/ \
> config/gnupg/Release
gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
mv config/gnupg/Release \
chroot/var/lib/$POOL_DIR/dists/$R_CODENAME/Release
mv config/gnupg/Release.asc \
chroot/var/lib/$POOL_DIR/dists/$R_CODENAME/Release.gpg
cp config/gnupg/pubring.gpg chroot/etc/apt/keyrings/$POOL_DIR.gpg
find chroot/var/lib/$POOL_DIR/ -name Packages | xargs rm
# We only want to have a cache for the pre-installed pool at this point
Chroot chroot "apt-get update -o Dir::Etc::SourceParts=/dev/null -oDir::Etc::SourceList=etc/apt/sources.list.d/$POOL_DIR.sources"
fi
done
gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
mv config/gnupg/Release \
chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
mv config/gnupg/Release.asc \
chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
cp config/gnupg/pubring.gpg chroot/etc/apt/keyrings/preinstalled-pool.gpg
find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
# We only want to have a cache for the pre-installed pool at this point
Chroot chroot "apt-get update -o Dir::Etc::SourceParts=/dev/null -oDir::Etc::SourceList=etc/apt/sources.list.d/preinstalled-pool.sources"
fi
case $PROJECT:$SUBPROJECT in
*)
if [ -e "config/seeded-snaps" ]; then
@ -365,7 +394,7 @@ EOF
# affected by this, we manually clear out the archive-related Packages
# files in the cache.
case $PROJECT in
ubuntu|xubuntu|kubuntu|ubuntu-budgie|ubuntukylin|ubuntu-mate|ubuntucinnamon|ubuntu-unity|edubuntu|lubuntu)
ubuntu|xubuntu|kubuntu|ubuntu-budgie|ubuntukylin|ubuntu-mate|ubuntucinnamon|ubuntu-unity|edubuntu)
rm -f chroot/var/lib/apt/lists/*ubuntu.com*_Packages
;;
esac
@ -411,7 +440,7 @@ done
# we don't need a manifest-remove for a layered-aware installer
# here we have a list of all new-installer flavors
case $PROJECT in
ubuntu|ubuntu-budgie|lubuntu)
ubuntu|ubuntu-budgie)
rm -f livecd.${PROJECT}-manifest-remove
rm -f config/manifest-minimal-remove
;;
@ -469,7 +498,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
continue
fi
case $FLAVOUR in
allwinner|virtual|generic-hwe-*)
allwinner|virtual|generic-hwe-*|lowlatency-hwe-*)
FLAVOUR="generic"
;;
oem-*)
@ -481,12 +510,6 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
intel-iotg*)
FLAVOUR="intel-iotg"
;;
lowlatency-hwe-*)
FLAVOUR="lowlatency"
;;
nvidia-hwe-*)
FLAVOUR="nvidia"
;;
esac
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then

View File

@ -1,11 +1,11 @@
#!/bin/bash
#! /bin/sh
set -e
case $ARCH:$SUBARCH in
amd64:|amd64:generic|amd64:intel-iot|\
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|arm64:nvidia|\
arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|arm64:x13s|\
arm64:largemem|\
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
arm64:tegra|arm64:tegra-igx|arm64:tegra-jetson|\
arm64:x13s|arm64:largemem|\
armhf:|\
i386:|\
ppc64el:|\
@ -78,14 +78,6 @@ BINARY_HOOKS=
APT_OPTIONS=" --yes -oDebug::pkgDepCache::AutoInstall=yes "
# Should we attempt to offer both the bridge and default kernel?
USE_BRIDGE_KERNEL=false
# Why are we using bridge kernel? Value is ignored for USE_BRIDGE_KERNEL=false.
# Possible reasons are zfs, drivers.
BRIDGE_KERNEL_REASONS="zfs,drivers"
# When building install-sources, what kernel is the default?
DEFAULT_KERNEL=
PASSES_TO_LAYERS=false
_PASSES_TO_LAYERS= # Stores the initial value of PASSES_TO_LAYERS
PASSES=
@ -391,7 +383,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
;;
esac
;;
ubuntu-server:live|ubuntu-mini-iso:|ubuntu-core-installer:*)
ubuntu-server:live|ubuntu-mini-iso:|ubuntu-core-installer:)
IMAGEFORMAT=plain
;;
esac
@ -431,19 +423,17 @@ case $IMAGEFORMAT in
PREINSTALLED=true
;;
plain)
fs=$IMAGEFORMAT
case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:live|ubuntu-core-installer:*)
touch config/universe-enabled
ubuntu-server:live|ubuntu-core-installer:)
touch config/universe-enabled
;;
ubuntu-mini-iso:)
fs=none
;;
*)
PREINSTALLED=true
;;
esac
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $fs"
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
;;
ubuntu-image)
@ -479,9 +469,6 @@ case $IMAGEFORMAT in
echo "$NOW" > config/disk-info
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
fi
if [ -n "$SECTOR_SIZE" ]; then
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --sector-size=$SECTOR_SIZE"
fi
if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images
@ -539,6 +526,7 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap"
done
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Store model assertion in top dir to get it picked up later as a build artifact
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
echo "Configured ubuntu-image for the following model assertion:"
@ -568,7 +556,6 @@ case $IMAGEFORMAT in
# Save the model name used for building, mostly for any model-specific hook execution
echo "MODEL=$MODEL" >> config/common
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Fake finished configuration for lb build
mkdir -p .build
touch .build/config
@ -583,7 +570,7 @@ case $IMAGEFORMAT in
;;
*)
case $PROJECT in
kubuntu|ubuntu-unity)
kubuntu|lubuntu|ubuntu-unity)
add_package live casper
;;
esac
@ -652,7 +639,7 @@ case $PROJECT in
edubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin)
COMPONENTS='main restricted universe'
;;
lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio|xubuntu)
lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
COMPONENTS='main restricted universe multiverse'
;;
esac
@ -673,11 +660,9 @@ if ! [ -e config/germinate-output/structure ]; then
-s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
fi
# Common functionality for layered desktop images
common_layered_desktop_image() {
do_layered_desktop_image() {
touch config/universe-enabled
PASSES_TO_LAYERS="true"
if [ -n "$HAS_MINIMAL" ]; then
if [ -z "$MINIMAL_TASKS" ]; then
MINIMAL_TASKS="${FLAVOUR}-desktop-minimal"
@ -687,13 +672,8 @@ common_layered_desktop_image() {
fi
# the minimal layer, for minimal installs
add_task minimal minimal standard $MINIMAL_TASKS
# If Dracut is enabled, include it early
if [ -n "$NEEDS_DRACUT" ]; then
add_package minimal dracut
fi
# fixme: this should go in seeds, not be in code here
add_package minimal cloud-init
add_package minimal linux-$KERNEL_FLAVOURS
MINIMAL_PREFIX=minimal.
fi
@ -709,7 +689,6 @@ common_layered_desktop_image() {
if [ -z "$HAS_MINIMAL" ]; then
STANDARD_TASKS="minimal standard $STANDARD_TASKS"
add_package standard cloud-init
add_package standard linux-$KERNEL_FLAVOURS
fi
add_task ${MINIMAL_PREFIX}standard $STANDARD_TASKS
LIVE_PREFIX="${LIVE_PREFIX}standard."
@ -718,14 +697,7 @@ common_layered_desktop_image() {
# the live layer, contains all packages for the live session installer
[ -n "$LIVE_TASK" ] || LIVE_TASK=${FLAVOUR}-live
add_task ${LIVE_PREFIX}live "$LIVE_TASK"
add_package ${LIVE_PREFIX}live casper
# If Dracut is enabled, ensure it is removed in the live layer
# casper still depends on initramfs-tools
if [ -n "$NEEDS_DRACUT" ]; then
remove_package ${LIVE_PREFIX}live dracut
add_package ${LIVE_PREFIX}live initramfs-tools
fi
add_package ${LIVE_PREFIX}live linux-$KERNEL_FLAVOURS casper
if [ -n "$LANGUAGE_BASE" ]; then
# language support
@ -764,11 +736,6 @@ common_layered_desktop_image() {
else
STANDARD_IS_DEFAULT=yes
fi
}
# Function for standard layered desktop image
do_layered_desktop_image() {
common_layered_desktop_image
if [ -n "$HAS_MINIMAL" ]; then
[ -n "$MINIMAL_NAME" ] \
@ -798,8 +765,6 @@ do_layered_desktop_image() {
EOF
fi
DEFAULT_KERNEL="linux-$KERNEL_FLAVOURS"
if [ "$LOCALE_SUPPORT" != none ]; then
/usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po \
@ -844,16 +809,6 @@ case $PROJECT in
HAS_DEFAULT_LANGUAGES=yes
LANGUAGE_BASE=desktop
KERNEL_FLAVOURS='generic-hwe-24.04'
case $SUBARCH in
nvidia)
KERNEL_FLAVOURS="nvidia-hwe-24.04"
;;
*)
# nothing to do here.
;;
esac
do_layered_desktop_image
# Enchanced secureboot stuff
@ -889,6 +844,26 @@ case $PROJECT in
esac
;;
ubuntu-core-desktop)
touch config/universe-enabled
KERNEL_FLAVOURS='generic-hwe-24.04'
PASSES_TO_LAYERS="true"
# the minimal layer, for minimal installs
add_task minimal minimal
# the live layer, contains all packages for the live session installer
add_snap minimal.live ubuntu-core-desktop-installer/classic core22 snapd
add_package minimal.live linux-$KERNEL_FLAVOURS plymouth-theme-spinner squashfs-tools snapd cloud-init gsettings-desktop-schemas yaru-theme-gtk lshw
echo "Configuring for additional payload preparation"
UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G"
EXTRA_SNAPS="$EXTRA_SNAPS evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-system-monitor gnome-text-editor gnome-weather loupe snapd-desktop-integration snap-store ubuntu-core-desktop-init workshops"
for snap in $EXTRA_SNAPS; do
UBUNTU_IMAGE_PAYLOAD_ARGS="$UBUNTU_IMAGE_PAYLOAD_ARGS --snap $snap"
done
echo "UBUNTU_IMAGE_PAYLOAD_ARGS=\"$UBUNTU_IMAGE_PAYLOAD_ARGS\"" >> config/common
;;
ubuntu-oem)
HAS_MINIMAL=yes
MINIMAL_NAME="Ubuntu Desktop for OEM (minimal)"
@ -906,6 +881,7 @@ case $PROJECT in
add_task install minimal standard
add_task install kubuntu-desktop
LIVE_TASK='kubuntu-live'
KERNEL_FLAVOURS='generic-hwe-24.04'
add_chroot_hook remove-gnome-icon-cache
;;
@ -915,7 +891,7 @@ case $PROJECT in
MINIMAL_TASKS=edubuntu-desktop-gnome-minimal
MINIMAL_DESC="A minimal installation of the Edubuntu Desktop."
STANDARD_TASKS=edubuntu-desktop-gnome
KERNEL_FLAVOURS=generic
KERNEL_FLAVOURS='generic-hwe-24.04'
do_layered_desktop_image
;;
@ -924,32 +900,21 @@ case $PROJECT in
UCFLAVOUR="Ubuntu Cinnamon"
HAS_MINIMAL=yes
MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
KERNEL_FLAVOURS=generic
KERNEL_FLAVOURS='generic-hwe-24.04'
do_layered_desktop_image
;;
ubuntu-unity)
lubuntu|ubuntu-unity)
add_task install minimal standard ${PROJECT}-desktop
LIVE_TASK=${PROJECT}-live
KERNEL_FLAVOURS='generic-hwe-24.04'
;;
lubuntu)
UCFLAVOUR="Lubuntu"
HAS_MINIMAL=yes
PASSES_TO_LAYERS="true"
MINIMAL_TASKS=lubuntu-desktop-minimal
MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
KERNEL_FLAVOURS=generic
NEEDS_DRACUT=yes
common_layered_desktop_image
;;
ubuntukylin)
# Ubuntu Kylin now ships the new installer.
UCFLAVOUR="Ubuntu Kylin"
HAS_MINIMAL=yes
MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
KERNEL_FLAVOURS=generic
KERNEL_FLAVOURS='generic-hwe-24.04'
do_layered_desktop_image
;;
@ -959,7 +924,7 @@ case $PROJECT in
MINIMAL_TASKS=xubuntu-minimal
MINIMAL_NAME="Xubuntu Minimal"
MINIMAL_DESC="A minimal installation of the Xubuntu Desktop."
KERNEL_FLAVOURS=generic
KERNEL_FLAVOURS='generic-hwe-24.04'
case ${SUBPROJECT:-} in
minimal)
HAS_STANDARD=no
@ -985,18 +950,16 @@ case $PROJECT in
HAS_MINIMAL=yes
MINIMAL_TASKS=ubuntu-mate-core
MINIMAL_DESC="A minimal installation of the $UCFLAVOUR Desktop."
KERNEL_FLAVOURS=generic
KERNEL_FLAVOURS='generic-hwe-24.04'
do_layered_desktop_image
;;
ubuntustudio)
ubuntustudio-dvd)
# By default Ubuntu Studio now ships the new installer.
UCFLAVOUR="Ubuntu Studio"
HAS_MINIMAL=yes
MINIMAL_TASKS=ubuntustudio-desktop-core
MINIMAL_DESC="A minimal installation of $UCFLAVOUR. Customize afterwards with $UCFLAVOUR Installer."
STANDARD_DESC="A full installation of $UCFLAVOUR."
KERNEL_FLAVOURS=generic
STANDARD_TASKS="ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography"
LIVE_TASK=ubuntustudio-dvd-live
KERNEL_FLAVOURS='lowlatency-hwe-24.04'
do_layered_desktop_image
;;
@ -1009,14 +972,6 @@ case $PROJECT in
add_package ubuntu-server-minimal lxd-installer
add_task ubuntu-server-minimal.ubuntu-server minimal standard server
add_package ubuntu-server-minimal.ubuntu-server cloud-init
# If we have a multipath disk with LVM on top, we want to give
# multipath a chance to create the /dev/mapper/mpatha entry
# during the initramfs phase. Otherwise LVM will "steal" the
# device (e.g., /dev/sda2) and prevent multipath from using it
# after pivoting to the root filesystem of the live
# environment.
# See LP: #2080474 and LP: #1480399.
add_package ubuntu-server-minimal.ubuntu-server.installer multipath-tools-boot
add_task ubuntu-server-minimal.ubuntu-server.installer server-live
@ -1038,15 +993,10 @@ case $PROJECT in
variants='tegra-jetson'
;;
largemem)
# variants='ga-64k hwe-64k'
variants='ga-64k'
;;
nvidia)
variants='nvidia'
variants='ga-64k hwe-64k'
;;
*)
# variants='ga hwe'
variants='ga'
variants='ga hwe'
;;
esac
@ -1055,7 +1005,6 @@ case $PROJECT in
variants='ga'
fi
first_kernel=y
for variant in $variants; do
if [ "$variant" = "ga" ]; then
kernel_metapkg=linux-generic
@ -1081,21 +1030,12 @@ case $PROJECT in
elif [ "$variant" = "tegra-jetson" ]; then
kernel_metapkg=linux-nvidia-tegra-jetson
flavor=nvidia-tegra-jetson
elif [ "$variant" = "nvidia" ]; then
kernel_metapkg=linux-nvidia-hwe-$(lsb_release -sr)
flavor=nvidia
else
echo "bogus variant: $variant"
exit 1
fi
if [ "$first_kernel" = "y" ]; then
# Put the first kernel offered into the base layer
first_kernel=n
add_package ubuntu-server-minimal $kernel_metapkg
fi
add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
done
case $ARCH in
@ -1111,7 +1051,6 @@ case $PROJECT in
esac
NO_SQUASHFS_PASSES=ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot
DEFAULT_KERNEL="$kernel_metapkg"
/usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations
;;
@ -1129,19 +1068,12 @@ case $PROJECT in
# installer but it has a source catalog entry that points to the model
# created in ubuntu-core-installer/hooks/05-prepare-image.binary, which
# subiquity knows how to install.
if [ ${SUBPROJECT} == "desktop" ]; then
cp /usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-core-desktop-24-amd64.model-assertion config/
fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
PASSES_TO_LAYERS=true
add_task base server-minimal server
add_task base.live server-live
add_package base.live linux-image-generic
# Core installer images use the pc-kernel snap for its kernel
USE_BRIDGE_KERNEL=false
DEFAULT_KERNEL="snap:pc-kernel"
/usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations
;;
@ -1156,6 +1088,7 @@ case $PROJECT in
add_package install mini-iso-tools linux-generic
case $ARCH in
amd64)
add_package install cd-boot-images-amd64
;;
*)
echo "unexpected architecture for $PROJECT: '$ARCH'"
@ -1164,10 +1097,21 @@ case $PROJECT in
esac
;;
ubuntu-base|ubuntu-oci)
ubuntu-base)
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
ubuntu-oci)
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
if [ "${SUBPROJECT:-}" = minimized ]; then
# As unminimize has been spit out from livecd-rootfs into a new
# separate pacakge, users have been reporting this as a regression for
# Noble. So we'd like to add the unminimize package; cf: LP: #2078583.
APT_OPTIONS="${APT_OPTIONS:+$APT_OPTIONS }--no-install-recommends"
add_package install unminimize
fi
;;
ubuntu-wsl)
add_task install minimal ubuntu-wsl
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
@ -1218,6 +1162,9 @@ case $PROJECT in
riscv64*)
if [ -n "$SUBARCH" ]; then
case "${SUBARCH:-}" in
nezha|licheerv)
KERNEL_FLAVOURS=allwinner
;;
visionfive)
KERNEL_FLAVOURS=starfive
;;
@ -1406,9 +1353,6 @@ echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
echo "CHANNEL=\"${CHANNEL:-}\"" >> config/binary
echo "USE_BRIDGE_KERNEL=\"${USE_BRIDGE_KERNEL:-}\"" >> config/binary
echo "BRIDGE_KERNEL_REASONS=\"${BRIDGE_KERNEL_REASONS:-}\"" >> config/binary
echo "DEFAULT_KERNEL=\"${DEFAULT_KERNEL:-}\"" >> config/binary
if [ "${IMAGE_HAS_HARDCODED_PASSWORD:-}" = "1" ]; then
echo IMAGE_HAS_HARDCODED_PASSWORD=1 >> config/binary
@ -1516,11 +1460,28 @@ Pin-Priority: 500
EOF
fi
case $PROJECT:${SUBPROJECT:-} in
*-dvd:*)
. config/bootstrap
cat > config/archives/dvd.list.binary << EOF
deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse
deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
EOF
if [ "$PROPOSED" ]; then
cat >> config/archives/dvd.list.binary << EOF
deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
EOF
fi
;;
esac
case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
ubuntustudio:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
ubuntukylin:*|ubuntu-mate:*|ubuntu-core-installer:*|lubuntu:*)
ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*|ubuntu-core-installer:*)
# Ensure that most things e.g. includes.chroot are copied as is
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
case $entry in
@ -1555,8 +1516,8 @@ case $PROJECT:${SUBPROJECT:-} in
esac
case $PROJECT in
ubuntu-oem|ubuntustudio|edubuntu|ubuntu-budgie|ubuntucinnamon| \
xubuntu|ubuntukylin|ubuntu-mate|lubuntu)
ubuntu-oem|ubuntustudio-dvd|edubuntu|ubuntu-budgie|ubuntucinnamon| \
xubuntu|ubuntukylin|ubuntu-mate)
cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot \
config/includes.chroot
@ -1604,8 +1565,8 @@ if [ "$EXTRA_PPAS" ]; then
extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
cat >> config/archives/extra-ppas.list.chroot <<EOF
deb https://ppa.launchpadcontent.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
deb-src https://ppa.launchpadcontent.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
deb-src http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main
EOF
if [ -n "$extra_ppa_pin" ]; then

View File

@ -1,12 +0,0 @@
#!/bin/bash -eux
. config/functions
chroot_dir=chroot
# Networking interface configuration relies udev.
# In normal LXD images, it's a transitive depends of ubuntu-cloud-minimal
# seed, which isn't present in buildd images.
chroot "$chroot_dir" apt-get -y update
env DEBIAN_FRONTEND=noninteractive chroot "$chroot_dir" apt-get -y install udev
chroot "$chroot_dir" apt-get -y clean

View File

@ -257,13 +257,10 @@ mount_disk_image() {
mount_image ${disk_image} "${rootpart}"
mount_partition "${rootfs_dev_mapper}" $mountpoint
local boot_dev="${loop_device}p13"
local boot_dev="${loop_device}p16"
if flock -x ${loop_device} \
[ -b ${boot_dev} -a -e $mountpoint/boot ]; then
# Only mount if assumed boot_dev is XBOOTLDR type
if sgdisk -i13 "${loop_device}" | grep -i BC13C2FF-59E6-4262-A352-B275FD6F7172 ; then
flock -x ${loop_device} mount "${boot_dev}" $mountpoint/boot
fi
flock -x ${loop_device} mount "${boot_dev}" $mountpoint/boot
fi
# Having one partition mounted should avoid udev-triggered partition
@ -565,12 +562,8 @@ _snap_post_process() {
core[0-9]*)
# If the 'core' snap is not present, assume we are coreXX-only and
# install the snapd snap.
channel=stable
if [ $SUBPROJECT = "dangerous" ]; then
channel=$CHANNEL
fi
if [ ! -f ${snaps_dir}/core_[0-9]*.snap ]; then
_snap_preseed $CHROOT_ROOT snapd "$channel"
_snap_preseed $CHROOT_ROOT snapd stable
fi
;;
core)
@ -805,6 +798,12 @@ snap_preseed() {
exit 1
fi
if [ $PROJECT = ubuntu-core-installer ] && [ $SNAP_NAME = subiquity ]; then
# The ubuntu-core-installer project requires features not yet
# present in the latest/ubuntu/stable-24.04 or stable branches.
CHANNEL=latest/ubuntu/stable-24.10
fi
_snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
# Mark this image as having snapd installed explicitly.
@ -1070,56 +1069,40 @@ EOF
# it disables all previous network config in /etc/netplan so
# any previous 50-cloud-init.yaml will be rendered inert.
# Position cloud-init-network.service After=NetworkManager.service.
# (LP: #2008952. Drop-in systemd files cannot redact existing
# dependencies (Before= or After=). So, replace the entire unit
# with an override in /etc/systemd/system/cloud-init-network.service.
# Avoid issues reported by debsums (LP: #2069391) by not overwriting
# unit files delivered by the cloud-init deb.
# This drop-in will need to track any changes introduced by cloud-init
# SRUs which alter the cloud-init-network.service unit values.
# Position cloud-init.service After=NetworkManager.service.
# (LP: #2008952).
# We override the entire cloud-init.service definition because
# systemd drop-in files only allow adding Before/After constraints
# yet we are dropping the Before=sysinit.target from the upstream
# cloud-init.service.
# This override can be dropped when NetworkManager.service can run
# Before=sysinit.target when it drops strict dbus.service dependency.
# 24.3 renamed cloud-init.service to cloud-init-network.service for
# single process mode
mkdir -p chroot/etc/systemd/system/
cat <<EOF > chroot/etc/systemd/system/cloud-init-network.service
cat <<EOF > chroot/lib/systemd/system/cloud-init.service
${AUTOMATION_HEADER}
# Based on cloud-init 24.3 for Desktop LiveCD
# Redact sysinit.target from Before, add After=NetworkManager*.service
# (LP: #2008952)
# Based on cloud-init 23.1 for Desktop LiveCD
[Unit]
# https://cloudinit.readthedocs.io/en/latest/explanation/boot.html
Description=Cloud-init: Network Stage
Description=Initial cloud-init job (metadata service crawler)
DefaultDependencies=no
Wants=cloud-init-local.service
Wants=sshd-keygen.service
Wants=sshd.service
After=cloud-init-local.service
After=systemd-networkd-wait-online.service
# Installer Added After=NetworkManager* ordering
After=NetworkManager.service
After=NetworkManager-wait-online.service
After=networking.service
After=NetworkManager.service NetworkManager-wait-online.service
Before=network-online.target
Before=sshd-keygen.service
Before=sshd.service
Before=systemd-user-sessions.service
# Before=sysinit.target Redacted due to NetworkManager.service dbus depends
# Before=sysinit.target Installer removed to allow for NM dependency
Before=shutdown.target
Conflicts=shutdown.target
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
Before=systemd-user-sessions.service
[Service]
Type=oneshot
# This service is a shim which preserves systemd ordering while allowing a
# single Python process to run cloud-init's logic. This works by communicating
# with the cloud-init process over a unix socket to tell the process that this
# stage can start, and then wait on a return socket until the cloud-init
# process has completed this stage. The output from the return socket is piped
# into a shell so that the process can send a completion message (defaults to
# "done", otherwise includes an error message) and an exit code to systemd.
ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/network.sock -s /run/cloud-init/share/network-return.sock | sh'
ExecStart=/usr/bin/cloud-init init
RemainAfterExit=yes
TimeoutSec=0
@ -1178,14 +1161,9 @@ divert_update_initramfs () {
--divert /usr/sbin/update-initramfs.REAL --rename \
/usr/sbin/update-initramfs"
cat > chroot/usr/sbin/update-initramfs <<'EOF'
#!/bin/sh
#! /bin/sh
if [ $# != 1 ] || [ "$1" != -u ]; then
if [ -x /usr/sbin/update-initramfs.REAL ]; then
exec /usr/sbin/update-initramfs.REAL "$@"
else
echo "update-initramfs.REAL not found. Skipping execution." >&2
exit 0
fi
exec update-initramfs.REAL "$@"
fi
echo "update-initramfs: diverted by livecd-rootfs (will be called later)" >&2
@ -1341,39 +1319,3 @@ reset_snapd_state() {
chroot "$rootdir" apt-get install --reinstall -y snapd
teardown_mountpoint "$rootdir"
}
write_kernel_yaml() {
# Generate the kernel.yaml fragment used as input for
# update-source-catalog.
#
# the newer kernel is the default kernel!
# bridge is the older, fallback kernel.
# $1 string, default kernel, such as "linux-generic"
# $2 string with comma seperated list of bridge reasons,
# usually "zfs,drivers"
local default="$1"
local reasons="$2"
cat <<EOF > config/kernel.yaml
kernel:
default: "$default"
EOF
# To specify fallback to a bridge kernel, construct a kernel.yaml
# with the following:
#
# kernel:
# default: linux-foo
# bridge: linux-foo-brg-YY.MM
# bridge_reasons: [zfs, drivers]
#
# If an install is using zfs or "drivers", use the bridge kernel, else
# use the default kernel.
if $USE_BRIDGE_KERNEL ; then
cat <<EOF >> config/kernel.yaml
bridge: "${default}-brg-$(release_ver)"
bridge_reasons: [$reasons]
EOF
fi
}

View File

@ -163,24 +163,15 @@ build_layered_squashfs () {
# (rather than the default which is to skip copies based
# on size + mtime)
# --no-times to not copy mtimes from source to dest (we
# do care about mtime in the image but want to
# don't care about mtime in the image and want to
# deduplicate files that have indentical contents but
# different mtimes, and mtime will be fixed below)
# different mtimes)
# --del because we want to remove files that have been
# deleted in this layer.
rsync -aXHAS --checksum --no-times --del chroot/ chroot-2/
umount chroot-2
rmdir chroot-2
overlay_dir="$overlay_dir-2"
# We use rsync with --no-times rsync (see above)
# for the absolute best size reduction. But there are
# cases where we want mtime preservation to match what
# was found in the original archive packages, such as
# keeping .py mtime in sync with the matching .pyc.
# Operate on the upperdir directly, so that we are only
# modifying mtime on files that are actually changed in
# this layer. LP: #2107332
/usr/share/livecd-rootfs/sync-mtime chroot "$overlay_dir"
fi
create_squashfs "${overlay_dir}" ${squashfs_f}
@ -194,7 +185,7 @@ build_layered_squashfs () {
if [ -f config/seeded-languages ]; then
usc_opts="$usc_opts --langs $(cat config/seeded-languages)"
fi
/usr/share/livecd-rootfs/update-source-catalog source $usc_opts
/usr/share/livecd-rootfs/update-source-catalog $usc_opts
else
echo "No catalog entry template for $pass"
fi
@ -213,13 +204,6 @@ do
build_layered_squashfs "${_PASS}" ${*}
done
if [ -n "$DEFAULT_KERNEL" -a -f livecd.${PROJECT_FULL}.install-sources.yaml ]; then
write_kernel_yaml "$DEFAULT_KERNEL" "$BRIDGE_KERNEL_REASONS"
/usr/share/livecd-rootfs/update-source-catalog merge \
--output livecd.${PROJECT_FULL}.install-sources.yaml \
--template config/kernel.yaml
fi
# Ubiquity-compatible removal manifest for ISO not using a layered-aware installer
if [ -n "$(ls livecd.${PROJECT_FULL}.*install.live.manifest.full 2>/dev/null)" ] && \
[ -n "$(ls livecd.${PROJECT_FULL}.*install.manifest.full 2>/dev/null)" ]; then

View File

@ -206,6 +206,13 @@ create_chroot_pass () {
[ "$livepass" != "$pass" ] && continue
lb chroot_linux-image ${*}
lb chroot_live-packages ${*}
if [ "$LB_LINUX_PACKAGES" = "linux" ]; then
for flavour in $LB_LINUX_FLAVOURS; do
mkdir -p chroot/etc/subiquity
echo "linux-$flavour" > chroot/etc/subiquity/kernel-meta-package
break
done
fi
break
done

View File

@ -0,0 +1,12 @@
version: 1
source:
id: ubuntu-core-desktop
search_drivers: false
interactive-sections:
- locale
- keyboard
- storage
identity:
username: ubuntu
password: '$1$zB3Qu2ef$TKLhQpQlKRyCZGUdHFFMH/'
hostname: ubuntu

View File

@ -0,0 +1,21 @@
#! /bin/sh
set -eu
case ${PASS:-} in
minimal.live)
;;
*)
exit 0
;;
esac
mkdir -p "/etc/initramfs-tools/conf.d"
cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
export CASPER_GENERATE_UUID=1
EOF
cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf
LAYERFS_PATH=${PASS}.squashfs
EOF

View File

@ -0,0 +1,117 @@
# The top level settings are used as module
# and system configuration.
# A set of users which may be applied and/or used by various modules
# when a 'default' entry is found it will reference the 'default_user'
# from the distro configuration specified below
users:
- default
# If this is set, 'root' will not be able to ssh in and they
# will get a message to login instead as the default $user
disable_root: true
# This will cause the set+update hostname module to not operate (if true)
preserve_hostname: true
ssh_pwauth: yes
chpasswd:
expire: false
# This is the initial network config.
# It can be overwritten by cloud-init or subiquity.
network:
version: 2
ethernets:
zz-all-en:
match:
name: "en*"
dhcp4: true
zz-all-eth:
match:
name: "eth*"
dhcp4: true
# We used to have a custom final_message here. Just use the default instead.
# Example datasource config
# datasource:
# Ec2:
# metadata_urls: [ 'blah.com' ]
# timeout: 5 # (defaults to 50 seconds)
# max_wait: 10 # (defaults to 120 seconds)
# The modules that run in the 'init' stage
cloud_init_modules:
- bootcmd
- write-files
- ca-certs
- rsyslog
- users-groups
- ssh
# The modules that run in the 'config' stage
cloud_config_modules:
# Emit the cloud config ready event
# this can be used by upstart jobs for 'start on cloud-config'.
- ssh-import-id
- set-passwords
- timezone
- disable-ec2-metadata
- runcmd
# The modules that run in the 'final' stage
cloud_final_modules:
- scripts-per-once
- scripts-user
- ssh-authkey-fingerprints
- keys-to-console
- phone-home
- final-message
# System and/or distro specific settings
# (not accessible to handlers/transforms)
system_info:
# This will affect which distro class gets used
distro: ubuntu
# Default user name + that default users groups (if added/used)
default_user:
name: installer
lock_passwd: false
gecos: Ubuntu
groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
shell: /usr/bin/subiquity-shell
# Automatically discover the best ntp_client
ntp_client: auto
# Other config here will be given to the distro class and/or path classes
paths:
cloud_dir: /var/lib/cloud/
templates_dir: /etc/cloud/templates/
upstart_dir: /etc/init/
package_mirrors:
- arches: [i386, amd64]
failsafe:
primary: http://archive.ubuntu.com/ubuntu
security: http://security.ubuntu.com/ubuntu
search:
primary:
- http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
- http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
- http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
security: []
- arches: [arm64, armel, armhf]
failsafe:
primary: http://ports.ubuntu.com/ubuntu-ports
security: http://ports.ubuntu.com/ubuntu-ports
search:
primary:
- http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
- http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
- http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
security: []
- arches: [default]
failsafe:
primary: http://ports.ubuntu.com/ubuntu-ports
security: http://ports.ubuntu.com/ubuntu-ports
ssh_svcname: ssh

View File

@ -0,0 +1,4 @@
output: {all: '>> /var/log/cloud-init-output.log'}
no_ssh_fingerprints: true
ssh:
emit_keys_to_console: false

View File

@ -0,0 +1,2 @@
[Journal]
RateLimitIntervalSec=0

View File

@ -0,0 +1,4 @@
# systemd in 23.04+ uses a newer "compact" format by default which is not
# understood by the systemd libraries from jammy used in the subiquity snap.
[Service]
Environment="SYSTEMD_JOURNAL_COMPACT=0"

View File

@ -0,0 +1,4 @@
# systemd in 22.04+ uses "hash table hardening" by default which is not
# understood by the systemd libraries from focal used in the subiquity snap.
[Service]
Environment="SYSTEMD_JOURNAL_KEYED_HASH=0"

View File

@ -0,0 +1,3 @@
#!/bin/sh
exec sudo snap run subiquity

View File

@ -0,0 +1,3 @@
[Service]
ExecStart=
ExecStart=-/sbin/agetty --noclear -n --autologin ubuntu-server %I $TERM

View File

@ -0,0 +1,9 @@
[Unit]
Description=Subiquity, the installer for Ubuntu Server %I
After=snapd.seeded.service
StartLimitInterval=0
[Service]
Environment=SNAP_REEXEC=0
ExecStart=
ExecStart=/usr/bin/snap run subiquity.subiquity-service %I

View File

@ -0,0 +1,4 @@
[Service]
StandardOutput=tty
ExecStart=
ExecStart=/usr/bin/snap run subiquity --ssh

View File

@ -0,0 +1,14 @@
[Unit]
IgnoreOnIsolate=yes
After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service
[Service]
Environment=SNAP_REEXEC=0
UtmpIdentifier=tty1
TTYPath=/dev/tty1
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
KillMode=process
IgnoreSIGPIPE=no
SendSIGHUP=yes

View File

@ -0,0 +1,2 @@
[Service]
Environment=SNAP_REEXEC=0

View File

@ -0,0 +1,4 @@
[Mount]
What=/dev/disk/by-uuid/00c629d6-06ab-4dfd-b21e-c3186f34105d
Where=/subiquity_config
Type=ext4

View File

@ -0,0 +1,9 @@
127.0.0.1 localhost.localdomain localhost
::1 localhost6.localdomain6 localhost6
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
fe00::0 ip6-localnet
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
ff02::3 ip6-allhosts

View File

@ -0,0 +1,11 @@
- default: true
description:
en: Ubuntu Core Desktop.
id: ubuntu-core-desktop
locale_support: none
name:
en: Ubuntu Core Desktop
path: filesystem.img.xz
type: dd-xz:file
size: @SIZE@
variant: core

View File

@ -0,0 +1,187 @@
type: model
authority-id: canonical
revision: 5
series: 16
brand-id: canonical
model: ubuntu-core-desktop-22-amd64
architecture: amd64
base: core22-desktop
display-name: Ubuntu Core Desktop 22 (amd64)
grade: signed
snaps:
-
default-channel: 22/stable
id: mZqHskGgGDECRCKP7h7ef3Rl2wTwyNfy
name: pc-desktop
type: gadget
-
default-channel: 23.10/stable
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
name: pc-kernel
type: kernel
-
default-channel: latest/edge/ubuntu-core-desktop
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
name: snapd
type: snapd
-
default-channel: latest/stable
id: qRMmQqNDz8kRUTqFIgqk2RzNNoC7jUZ6
name: core22-desktop
type: base
-
default-channel: latest/stable
id: LVkazk0JLrL0ivuHRlv3wp3bK1nAgwtN
name: ubuntu-desktop-session
type: app
-
default-channel: latest/stable
id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT
name: core22
type: base
-
default-channel: 22/stable
id: RmBXKl6HO6YOC2DE4G2q1JzWImC04EUy
name: network-manager
type: app
-
default-channel: latest/stable
id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR
name: bare
type: base
-
default-channel: latest/stable
id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
name: gtk-common-themes
type: app
-
default-channel: latest/stable
id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
name: gnome-42-2204
type: app
-
default-channel: latest/stable
id: m1eQacDdXCthEwWQrESei3Zao3d5gfJF
name: cups
type: app
-
default-channel: latest/stable
id: WJKWBUuCDufOFw2p24tvkbbw02plGkbd
name: ipp-usb
type: app
-
default-channel: 22/stable
id: dVK2PZeOLKA7vf1WPCap9F8luxTk9Oll
name: avahi
type: app
-
default-channel: 22/stable
id: JmzJi9kQvHUWddZ32PDJpBRXUpGRxvNS
name: bluez
type: app
-
default-channel: latest/stable
id: Si21Q1kjaZpyJ8TfGbAnxJ4y6KMv7FuW
name: loupe
presence: optional
type: app
-
default-channel: latest/stable
id: EDFg87ESUg9sAIlm0Vm5Wmr0LjiEonSm
name: evince
presence: optional
type: app
-
default-channel: latest/stable/ubuntu-23.10
id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
name: firefox
presence: optional
type: app
-
default-channel: latest/stable
id: J8OcDPQ0JM8dbvk29HRqpWVI9kBw0atG
name: gnome-calculator
presence: optional
type: app
-
default-channel: latest/stable
id: qJcS3UjpF9AMJKWAiKwA5EWbm0y6Uduw
name: gnome-characters
presence: optional
type: app
-
default-channel: latest/stable
id: 8NtSF2nXW6krsxbXBYydy1j985k6ZsVK
name: gnome-clocks
presence: optional
type: app
-
default-channel: latest/stable
id: BzJuWXmCIpyjUKotXPWU2psnl8gEh4hm
name: gnome-font-viewer
presence: optional
type: app
-
default-channel: latest/stable
id: kIMfmZTJspWa8vtfbgU3W9Nbv4V5Qgmh
name: gnome-logs
presence: optional
type: app
-
default-channel: latest/stable
id: PZj2sEabMQrVUV1HKZmmmXSk3E6wKC9i
name: gnome-text-editor
presence: optional
type: app
-
default-channel: latest/stable
id: LhzK7p8214jufMYx1kz43QkWhFnOKdbr
name: gnome-weather
presence: optional
type: app
-
default-channel: latest/stable
id: J60k4JY0HppjwOjW8dZdYc8obXKxujRu
name: lxd
type: app
-
default-channel: latest/edge/ubuntu-core-desktop
id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
name: snapd-desktop-integration
type: app
-
default-channel: latest/stable/ubuntu-23.10
id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
name: snap-store
type: app
-
default-channel: latest/stable
id: JMjaFobGn56fh1HepiaGuCxQgbWYnHc8
name: workshops
presence: optional
type: app
-
default-channel: latest/stable
id: 9BTClmjz31r0UltmbJ5nnGe0Xm1AzfMp
name: gnome-system-monitor
presence: optional
type: app
-
default-channel: latest/stable
id: xODwiAdjx9KGChvI1z9Xx2JWJE7oLFF6
name: ubuntu-core-desktop-init
type: app
storage-safety: prefer-encrypted
timestamp: 2023-10-21T10:19:41+00:00
sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
AcLBXAQAAQoABgUCZTP+wgAKCRDgT5vottzAEia0D/9FyEOb4Qai+sJQ/ilVqZ1L0FicTIwa9/Ae
khv5xXYGmukSzkIUGNYjvcCJByxgMiDsFOIIzrOYlJPmRFtdFOwm3KGS2JGthIUbQfElVbyPswZh
cgqYVuGMiRw8udlZHOmy2rWIKxo/uLMEsZzZuk83nC+ZzAoQoHOmcELuRtIc1qz9XAf6n7pd79S2
10cxG7vuaA1iVbqqtbSlQCAdKTdOCxw2/NHTZ8mIRtAQZGA1LP8IMEyv2Fi3FVpmN2derV78sO3f
kCf/KdYeD6d1a03WchIDsuPlvTpTOU3TSX07QWj+WrZHMDh9gpQHDdSIWswBCPIHa10R6aDRRUUK
/5dJDq77/CyY/Q/ivcAuFiTceghKVcx3Zci+VX2WgvLK9qYHYHSilb70nTvsDFUA/bKep57/xqeG
j03cvUaqHb6li2T2SmyzaQOGV5MF6XxlhcLWY19PHc2/ocLpukL4vxkl18Ur3FoYAOLODwrlxueS
FDu7u+qf+Ki2+f0ZtN70EPcFAQAJ4C0N6f9j9Z+9BQptTlVwrIzIUxIwxtkp27YvERno6bZPBRYs
T4YdzVSdPKXsItT/GUiqYwdgPTi61FZXTN/47yIaHZLUwMT9gg/9XgNqIHKIdFHxm6GWVxL0AqOp
JPIfqrsmVbewevzwV1Rgo1LbPKVVrjqPtW0QQlkS8w==

View File

@ -13,29 +13,15 @@ esac
. config/binary
. config/functions
case ${SUBPROJECT} in
desktop)
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
config/ubuntu-core-desktop-24-amd64.model-assertion --snap firefox chroot
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-core-24-amd64 > config/ubuntu-core-24-amd64.model
cat <<-EOF > config/edge.catalog-in.yaml
name: "Ubuntu Core Desktop 24"
description: >-
Ubuntu Core Desktop.
id: ubuntu-core-desktop
type: null
variant: core
locale_support: none
snapd_system_label: ubuntu-core-desktop-24-amd64
EOF
mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-desktop-24-amd64
;;
*)
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-core-24-amd64 > config/ubuntu-core-24-amd64.model
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
config/ubuntu-core-24-amd64.model --snap console-conf chroot
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
config/ubuntu-core-24-amd64.model --snap console-conf chroot
mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-24-amd64
rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
rm -rf chroot/system-seed
cat <<-EOF > config/edge.catalog-in.yaml
cat <<-EOF > config/edge.catalog-in.yaml
name: "Ubuntu Core 24"
description: >-
Ubuntu Core.
@ -45,15 +31,8 @@ variant: core
locale_support: none
snapd_system_label: ubuntu-core-24-amd64
EOF
mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-24-amd64
;;
esac
rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
rm -rf chroot/system-seed
PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH}
usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \
--template config/edge.catalog-in.yaml \
--size 0"
/usr/share/livecd-rootfs/update-source-catalog source $usc_opts
--template config/edge.catalog-in.yaml \
--size 0"
/usr/share/livecd-rootfs/update-source-catalog $usc_opts

View File

@ -18,6 +18,20 @@ ssh_pwauth: yes
chpasswd:
expire: false
# This is the initial network config.
# It can be overwritten by cloud-init or subiquity.
network:
version: 2
ethernets:
zz-all-en:
match:
name: "en*"
dhcp4: true
zz-all-eth:
match:
name: "eth*"
dhcp4: true
# We used to have a custom final_message here. Just use the default instead.
# Example datasource config

View File

@ -3,5 +3,6 @@ Description=Subiquity, the installer for Ubuntu Server %I
StartLimitInterval=0
[Service]
Environment=SNAP_REEXEC=0
ExecStart=
ExecStart=/usr/bin/snap run subiquity.subiquity-service %I

View File

@ -2,6 +2,7 @@
IgnoreOnIsolate=yes
[Service]
Environment=SNAP_REEXEC=0
UtmpIdentifier=tty1
TTYPath=/dev/tty1
TTYReset=yes

View File

@ -0,0 +1,2 @@
[Service]
Environment=SNAP_REEXEC=0

View File

@ -1,120 +0,0 @@
type: model
authority-id: canonical
series: 16
brand-id: canonical
model: ubuntu-core-desktop-24-amd64
architecture: amd64
base: core24-desktop
display-name: Ubuntu Core Desktop 24 (amd64)
grade: signed
snaps:
-
default-channel: 24/stable
id: mZqHskGgGDECRCKP7h7ef3Rl2wTwyNfy
name: pc-desktop
type: gadget
-
default-channel: 24-hwe/stable
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
name: pc-kernel
type: kernel
-
default-channel: latest/edge/ubuntu-core-desktop
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
name: snapd
type: snapd
-
default-channel: latest/stable
id: GY5GohJ4F1ZsWpkosG0joeZyDfHzTZrD
name: core24-desktop
type: base
-
default-channel: 24/stable
id: LVkazk0JLrL0ivuHRlv3wp3bK1nAgwtN
name: ubuntu-desktop-session
type: app
-
default-channel: latest/stable
id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT
name: core22
type: base
-
default-channel: latest/stable
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM
name: core24
type: base
-
default-channel: 24/stable
id: RmBXKl6HO6YOC2DE4G2q1JzWImC04EUy
name: network-manager
type: app
-
default-channel: latest/stable
id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR
name: bare
type: base
-
default-channel: latest/stable
id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
name: gtk-common-themes
type: app
-
default-channel: latest/stable
id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
name: gnome-42-2204
type: app
-
default-channel: latest/stable
id: m1eQacDdXCthEwWQrESei3Zao3d5gfJF
name: cups
type: app
-
default-channel: latest/stable
id: WJKWBUuCDufOFw2p24tvkbbw02plGkbd
name: ipp-usb
type: app
-
default-channel: 24/stable
id: dVK2PZeOLKA7vf1WPCap9F8luxTk9Oll
name: avahi
type: app
-
default-channel: 24/stable
id: JmzJi9kQvHUWddZ32PDJpBRXUpGRxvNS
name: bluez
type: app
-
default-channel: latest/stable/ubuntu-24.04
id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
name: firefox
presence: optional
type: app
-
default-channel: latest/edge/ubuntu-core-desktop
id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
name: snapd-desktop-integration
type: app
-
default-channel: latest/stable/ubuntu-24.04
id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
name: snap-store
type: app
-
default-channel: latest/candidate
id: tBdYpKjXcW5farGGJaWiYXrxIwMVMtx5
name: ubuntu-desktop-init
type: app
storage-safety: prefer-encrypted
timestamp: 2024-07-04T10:33:44+08:00
sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
AcLBXAQAAQoABgUCZoYTygAKCRDgT5vottzAEnlLD/4toc4w5IiLm/xmBFL8BVwXXVQsvNNtVYaT
NGSa+q7OJXeVbPQnnRMK4oH31IbGFngK3IHoc04LK76W2GQzAE4SQxTcV9VTlyPrVc6OeCn9rSWj
zFX/fOVuD5Wd6OOgNitaHqVHh8CDQFcsdOBICImHG6s0Au1mIDVQvV/DxcnnprJ53yXFCeastuX+
CnZiB6wOv/dzGHnIbhpUtKg5HV5jZoIkmplWAZr1IXd8gAPvltDzpJYwN6GMHK6SLUD1tgviP4ZB
gw9IT11DCeB9TOEnsAs7y1YApUdkxMSv4B+Jwew/lkjysncULqFCt6fCD3HEw+OdULb/OrFnYcSV
4NqPBop/9mi+CB5Fs3ubtlKxK9VnSJbLpXsyBeDvljVKp0MvNBpCTJnlGtRvQE/bHLpaAhRRsP0R
6cUqd1ieRm4wp/1/v+zMjdp6VL7co0/a6jZgtfptCMnCC6Z0KdLWGQjaXDwxNStqMK3h/Au2YWDc
ZgZ/+wTxMlDyU4i4gg+rByV2yPHfGeVpN7D7nuY8OWXq1ezESY6K5fsOW77/XEjZJOI3BFOJ6Xnl
2ATKBs6uSmMPQSZo21sk+E0c2gH8qj6L6mUcAz2qvilur9w4uEM3TRfZcAKPN+8lV44eB8/aZpq7
GfjsXFa+DpXJzWdC91SP4yIeojoj3OAl4gNwt0c85g==

View File

@ -9,9 +9,6 @@ esac
IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
FS_LABEL="cloudimg-rootfs"
# 2.4G GiB
# Since Plucky, ppc64el need more than the default 2.2GiB
IMAGE_SIZE=2576980378
. config/binary

View File

@ -284,7 +284,6 @@ install_grub() {
echo "Reducing initramfs size for ${SUBARCH} board"
mkdir -p mountpoint/etc/initramfs-tools/conf.d/
cp ${my_d}/riscv64/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/
cat ${my_d}/riscv64/initramfs-tools/allwinner >> mountpoint/etc/initramfs-tools/modules
chroot mountpoint update-initramfs -c -v -k all
echo "Installing U-Boot for ${SUBARCH} board"
if [ "$SUBARCH" = "licheerv" ]; then

View File

@ -39,26 +39,26 @@ create_partitions() {
sgdisk "${disk_image}" \
--new=15:0:204800 \
--typecode=15:ef00 \
--new=13::1G \
--typecode=13:ea00 \
--new=16::1G \
--typecode=16:ea00 \
--new=1:
;;
riscv64)
sgdisk "${disk_image}" \
--set-alignment=2 \
--new=13::1G \
--typecode=13:ea00 \
--new=15::+106M \
--typecode=15:ef00 \
--new=16::1G \
--typecode=16:ea00 \
--new=1:: \
--attributes=1:set:2
;;
amd64)
sgdisk "${disk_image}" \
--new=13::1G \
--typecode=13:ea00 \
--new=14::+4M \
--new=15::+106M \
--new=16::1G \
--typecode=16:ea00 \
--new=1::
sgdisk "${disk_image}" \
-t 14:ef02 \
@ -71,7 +71,7 @@ create_partitions() {
create_and_mount_boot_partitions() {
uefi_dev="${loop_device}p15"
boot_dev="${loop_device}p13"
boot_dev="${loop_device}p16"
mountpoint="$1"
mkfs.vfat -F 32 -n UEFI "${uefi_dev}"

View File

@ -1,3 +0,0 @@
# Required drivers to boot off MMC
mmc-block
sunxi-mmc

View File

@ -0,0 +1,4 @@
#!/bin/bash -eux
. /etc/os-release
echo "Ubuntu $VERSION" > /etc/ec2_version

Some files were not shown because too many files have changed in this diff Show More