diff options
| author | Olivier Gayot <[email protected]> | 2025-04-15 14:35:08 +0200 |
|---|---|---|
| committer | Dan Bungert <[email protected]> | 2025-07-28 14:40:02 -0600 |
| commit | 0ab394917d66d2b6c51e297bf9bf5d26ef36c360 (patch) | |
| tree | 6b747e3bcaa54784aeef727443e6bd1e49eb9006 | |
| parent | c383c357ce747cec1037a189be66d57e0842692d (diff) | |
zfs: increase size of keystoreubuntu/noble
On plucky, a 20MiB keystore does not allow the install to complete. For some
reason, cryptsetup seems to place the data segment at offset 32MiB instead of
16MiB (which was the case previously).
This results in warnings & errors:
When running crtypsetup luksFormat:
> Device /dev/zvol/rpool/keystore is too small for activation, there is no remaining space for data.
When runnign cryptsetup open:
> Requested offset is beyond real size of device /dev/zvol/rpool/keystore
LP: #2107381
Signed-off-by: Olivier Gayot <[email protected]>
(cherry picked from commit 148b02f5f4027ca508727110604e376f325a1078)
| -rw-r--r-- | curtin/block/zfs.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/curtin/block/zfs.py b/curtin/block/zfs.py index 519fa513..29ace32f 100644 --- a/curtin/block/zfs.py +++ b/curtin/block/zfs.py @@ -86,7 +86,9 @@ class ZPoolEncryption: # Create the dataset for the keystore. This is a bit special as it # won't be ZFS despite being on the zpool. - keystore_size = util.human2bytes("20M") + # We previously hardcoded the size to 20M but raised it to 36M for + # plucky, see LP: #2107381. + keystore_size = util.human2bytes("36M") zfs_create( self.poolname, "keystore", {"encryption": "off"}, keystore_size, ) |