git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/activation-script: Run userActivationScripts at login

Fixes https://github.com/NixOS/nixpkgs/issues/113240

commitdf25ca8520548431a3a7e85a7863655e76081d39 authorChuck <chuck@intelligence.org> dateMon 15 Feb 2021, 15:09 (6 years ago) parentf6ddd25
2 files changed+3−2
compare with master
unifiedsplit
nixos/modules/system/activation/activation-script.nix+1 nixos/tests/user-activation-scripts.nix+2−2
nixos/modules/system/activation/activation-script.nix+1
@@ -234,6 +234,7 @@ in
234234 script = config.system.userActivationScripts.script;
235235 unitConfig.ConditionUser = "!@system";
236236 serviceConfig.Type = "oneshot";
237+ wantedBy = [ "default.target" ];
237238 };
238239 };
239240 };
nixos/tests/user-activation-scripts.nix+2−2
@@ -25,9 +25,9 @@ import ./make-test-python.nix ({ lib, ... }: {
2525 machine.send_chars("pass1\n")
2626 machine.send_chars("touch login-ok\n")
2727 machine.wait_for_file("/home/alice/login-ok")
28− verify_user_activation_run_count(0) # Wrong! Should be 1
28+ verify_user_activation_run_count(1)
2929
3030 machine.succeed("/run/current-system/bin/switch-to-configuration test")
31− verify_user_activation_run_count(1) # Wrong! Should be 2
31+ verify_user_activation_run_count(2)
3232 '';
3333})