From daa1cd8d1457d59c5db9250d206c6147803c78df Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 30 Dec 2025 20:21:36 +0200 Subject: [PATCH] nixos/test/wpa_supplicant: replace activation script by systemd service See https://github.com/NixOS/nixpkgs/issues/475305 --- nixos/tests/wpa_supplicant.nix | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 921c111cfc1f..1adda72186f4 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -96,16 +96,27 @@ let # Note: secrets are stored outside /etc/ and /nix/store to # test for accessibility of these paths - system.activationScripts.wpa-secrets = { - deps = [ - "users" - "specialfs" + systemd.services.wpa-secrets = { + wantedBy = [ + "network.target" + "multi-user.target" ]; - text = '' - install -Dm600 -o wpa_supplicant ${pkgs.writeText "wpa" '' - psk_nixos_test=${naughtyPassphrase} - ''} /var/lib/secrets/wpa - ''; + before = [ + "network.target" + "multi-user.target" + ]; + serviceConfig = { + Type = "oneshot"; + }; + script = + let + secretFile = pkgs.writeText "wpa" '' + psk_nixos_test=${naughtyPassphrase} + ''; + in + '' + install -Dm600 -o wpa_supplicant ${secretFile} /var/lib/secrets/wpa + ''; }; # wireless client