From a840a13a18496748bfafaa7f92cb057b1ed40992 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 22 Sep 2026 20:10:32 -0400 Subject: [PATCH] stratisd.tests.stratisRoot: fix by adding cryptsetup to initrd --- nixos/modules/system/boot/stratisroot.nix | 1 + nixos/tests/installer.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stratisroot.nix b/nixos/modules/system/boot/stratisroot.nix index 349133ab540c..07d21b846cc2 100644 --- a/nixos/modules/system/boot/stratisroot.nix +++ b/nixos/modules/system/boot/stratisroot.nix @@ -34,6 +34,7 @@ in thin_repair = "${pkgs."thin-provisioning-tools"}/bin/thin_repair"; thin_metadata_size = "${pkgs."thin-provisioning-tools"}/bin/thin_metadata_size"; stratis-min = "${pkgs.stratisd}/bin/stratis-min"; + cryptsetup = "${pkgs.cryptsetup}/bin/cryptsetup"; }; services = lib.attrsets.mapAttrs' (mountPoint: fileSystem: { name = "stratis-setup-${fileSystem.stratis.poolUuid}"; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 59f8df3ea571..c3319c00dcc1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -1861,7 +1861,7 @@ in createPartitions = '' installer.succeed( "sgdisk --zap-all /dev/vda", - "sgdisk --new=1:0:+100M --typecode=0:ef00 /dev/vda", # /boot + "sgdisk --new=1:0:+200M --typecode=0:ef00 /dev/vda", # /boot "sgdisk --new=2:0:+1G --typecode=0:8200 /dev/vda", # swap "sgdisk --new=3:0:+5G --typecode=0:8300 /dev/vda", # / "udevadm settle",