curtin-dev team mailing list archive

[Olivier Gayot <mp+484500@xxxxxxxxxxxxxxxxxx>]

Olivier Gayot has proposed merging ~ogayot/curtin:larger-keystore into curtin:master.

Commit message:
zfs: increase size of keystore

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

Requested reviews:
  Server Team CI bot (server-team-bot): continuous-integration
  Dan Bungert (dbungert)
Related bugs:
  Bug #2107381 in curtin: "zfs + encryption fails with plucky iso dated 20250415  - Requested offset is beyond real size of device /dev/zvol/rpool/keystore"
  https://bugs.launchpad.net/curtin/+bug/2107381

For more details, see:
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/484500
-- 
Your team curtin developers is subscribed to branch curtin:master.

diff --git a/curtin/block/zfs.py b/curtin/block/zfs.py
index 519fa51..29ace32 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,
         )