~ogayot/curtin:zkey-recovery

Last commit made on 2023-09-20
Get this branch:
git clone -b zkey-recovery https://git.launchpad.net/~ogayot/curtin
Only Olivier Gayot can upload to this branch. If you are Olivier Gayot please log in for upload directions.

Branch merges

Branch information

Name:
zkey-recovery
Repository:
lp:~ogayot/curtin

Recent commits

6c682e4... by Olivier Gayot

block_meta: also add recovery key if zkey is used

When zkey is properly setup, we do not invoke cryptsetup luksFormat
ourselves. Instead we lean on zkey to invoke cryptsetup luksFormat for
us.

zkey seems to have no native support for invoking cryptsetup luksAddKey,
so we need to manually call it if we want to add a recovery key in a
second slot.

Signed-off-by: Olivier Gayot <email address hidden>

a7640fd... by Nick Rosbrook

apt: disable default deb822 migration

Turn off migration to deb822 by default, and update appropriate
docs/test to reflect this. When we are actually ready for this, the
logic in want_deb822() can be restored.

2004e04... by Dan Bungert

storage_config: handle partitions on 4k disk

In LP: #2035034, a user reported that the layout of existing
partitions was showing as 1/8th the correct size. Update storage_config
to no longer hard-code a 512 byte sector and read the value instead.

9e3cb71... by Dan Bungert

tests/data: 4k sector disk

2f87d08... by Dan Bungert

extract: log source information

If you try hard enough and follow mount commands backwards you can
surely get this same information, but when analyzing what the extract is
actually doing it's nice to just be able to see what the image stack is.

d5f5dde... by Olivier Gayot

apt_source: do not produce a deb822 source stanza with zero suite

When no suite is set for a given repository, we end up with a
deb822 styled source such as:

 Type: deb
 Suites:
 URIs: http://archive.ubuntu.com/ubuntu

This is invalid and apt/apt-get will raise the following error:

E: Malformed entry 2 in sources file
 /etc/apt/sources.list.d/ubuntu.sources (Suite)

Signed-off-by: Olivier Gayot <email address hidden>

307b32f... by Dan Bungert

docs: link to sources.list manpage for apt deb822

2d3fe30... by Dan Bungert

swap: add logging

The suggested swap size code just sort of returns 0 sometimes and
figuring out why is a complicated analysis of several variables.

Provide diagnostic info on those values, and the reason for the
decision.

9ef3bcb... by Michael Hudson-Doyle

distro: remove even more code from apt_update

The existing code tries to avoid redundant calls to 'apt update' but it
has flaws and redundant calls to 'apt update' should be fairly quick
anyway.

197bdbd... by Michael Hudson-Doyle

distro: remove disabling of deb-src lines in apt_update

The current code has the side-effect of ignoring deb822 .sources files
which is a problem that could be fixed but really it's hard to see why
this code is still useful (we do not expect to deploy images with
deb-src enabled!) so just deleting it makes more sense.