~dgadomski/curtin:grub-config-not-subsciptable

Last commit made on 2024-05-14
Get this branch:
git clone -b grub-config-not-subsciptable https://git.launchpad.net/~dgadomski/curtin
Only Dariusz Gadomski can upload to this branch. If you are Dariusz Gadomski please log in for upload directions.

Branch merges

Branch information

Name:
grub-config-not-subsciptable
Repository:
lp:~dgadomski/curtin

Recent commits

700b1f8... by Dariusz Gadomski

curthooks: fix deprecated GrubConfig properties syntax

There was a leftover example of accessing GrubConfig properties that has
been removed by commit 4587fd40dfd7eabd6677004e91340edcfe5a7472.

c66faff... by Olivier Gayot

util: fix lack of string interpolation when raising TiemoutError

e4c7d71... by Dan Bungert

util: log release of flock

83947e8... by Dan Bungert

zfs: add flock for keystore

In LP: #2057661 and the (currently) 3 duplicates, the luksFormat of
keystore can randomly fail. stracing of udevd looking for
https://systemd.io/BLOCK_DEVICE_LOCKING/ shows that indeed udevd is
examining these keystore devices.

Lock the keystore, and add some `udevadm settle` to be more like
Ubiquity behavior.

204562c... by Dan Bungert

block/zfs: flock for ZFS

Add flock calls around encrypted ZFS creation areas

LP: #2057661

974c0d0... by Dan Bungert

block/meta: add flock calls around disk wipe

LP: #2016860

63b0445... by Dan Bungert

util: add FlockEx context manager

a02daee... by Olivier Gayot

apt-config: avoid APT complaints about sources backup files

Before apt-config makes a change to ubuntu.sources or another source
file, it backs up the original file by appending the .curtin.old
extension.

However, by default, APT will emit a warning when a file with an unknown
extension is present in the etc/apt/sources.list.d directory. Currently,
known extensions are .sources and .list so when APT sees our .curtin.old
files, it does emit a warning.

 > N: Ignoring file 'ubuntu.sources.curtin.old' in directory
 '/etc/apt/sources.list.d/' as it has an invalid filename extension

Through Dir::Ignore-Files-Silently directives, APT can be configured to
ignore (i.e., not warn) some of the files that have unknown extensions.
By default, the list includes:

 Dir::Ignore-Files-Silently:: "\.disabled$";
 Dir::Ignore-Files-Silently:: "\.bak$";
 Dir::Ignore-Files-Silently:: "\.dpkg-[a-z]+$";
 Dir::Ignore-Files-Silently:: "\.ucf-[a-z]+$";
 Dir::Ignore-Files-Silently:: "\.save$";
 Dir::Ignore-Files-Silently:: "\.orig$";
 Dir::Ignore-Files-Silently:: "\.distUpgrade$";

We now back up the files using the .curtin.orig extension instead of
.curtin.old so that APT does not complain.

LP: #2058741

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

4d9513d... by Dan Bungert

py3.12: fix test deprecations

Swap two unittest deprecated calls for their supported coutnerparts
* s/assertRaisesRegexp/assertRaisesRegex/
* s/assertEquals/assertEqual/

Also fix whitespace lint issues created from doing the above.

54cc7d9... by Olivier Gayot

Merge branch 'nvme-stas-of-only'

https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/462257