From 819b0f4bb864b21327672a5b9f2d94a75c312078 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Nov 2020 21:18:57 +0100 Subject: [PATCH] nixos/initrd-network-ssh: fix test The test relied on moving `initrd` secrets from the store into the `initrd` which was fine here as it's only an integration test and not a production environment. However, this broke in 20.09 when support for this was dropped[1]. To make sure that the snakeoil key used as hostkey for `sshd` here actually gets copied into the VM, I added a small script for this that takes care of this process while building the initial ramdisk. [1] d930466b7728e5515991cb73c060fc3f32bdc001 --- nixos/tests/initrd-network-ssh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix index 017de6882081..0ad0563b0ce1 100644 --- a/nixos/tests/initrd-network-ssh/default.nix +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -22,6 +22,10 @@ import ../make-test-python.nix ({ lib, ... }: hostKeys = [ ./ssh_host_ed25519_key ]; }; }; + boot.initrd.extraUtilsCommands = '' + mkdir -p $out/secrets/etc/ssh + cat "${./ssh_host_ed25519_key}" > $out/secrets/etc/ssh/sh_host_ed25519_key + ''; boot.initrd.preLVMCommands = '' while true; do if [ -f fnord ]; then