move integrity modules to kmod_auto

cryptsetup doesn't automatically enable required ones

Signed-off-by: Zen <[email protected]>

Author: desultory

src/ugrd/crypto/cryptsetup.py

@@ -238,7 +238,7 @@ def _detect_luks_header_integrity(self, luks_info: dict) -> dict:
     Enables the dm-integrity module, and returns the integrity type. """
     for segment in luks_info.get("segments", {}).values():
         if integrity_type := segment.get("integrity", {}).get("type"):
-            self["kernel_modules"] = "dm_integrity"
+            self["_kmod_auto"] = "dm_integrity"
             return integrity_type
 
 

src/ugrd/fs/mounts.py

@@ -562,7 +562,7 @@ def _autodetect_dm(self, mountpoint, device=None) -> None:
         self.logger.info(f"[{c_(dev_name, 'blue')}] Slave is a CRYPT-SUBDEV, using its slave instead: {c_(slave_source, 'cyan')}")
         # Add the kmod for it
         self.logger.info(f"[{c_(dev_name, 'blue')}] Adding kmod for CRYPT-SUBDEV: {c_('dm-crypt', 'magenta')}")
-        self["kernel_modules"] = "dm_integrity"
+        self["_kmod_auto"] = "dm_integrity"
 
     autodetect_mount_kmods(self, slave_source)
 

tests/test_cryptsetup.py

@@ -36,7 +36,7 @@ def test_cryptsetup_integrity(self):
         generator = InitramfsGenerator(
             logger=self.logger,
             config="tests/cryptsetup_included_key.toml",
-            kernel_modules=["dm-integrity", "hmac", "sha256"],  # Specify this because its usually auto-detected during header validation
+            _kmod_auto=["dm-integrity", "hmac", "sha256"],  # Specify this because its usually auto-detected during header validation
             cryptsetup={"root": {"_dm-integrity": "hmac(sha256)"}},  # Use the type like defined in the header, not the proper args to test processing
         )
         generator.build()