diff options
| -rw-r--r-- | nixos/modules/system/activation/activation-script.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/user-activation-scripts.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 3a6930314b1..47313234d0b 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -234,6 +234,7 @@ in script = config.system.userActivationScripts.script; unitConfig.ConditionUser = "!@system"; serviceConfig.Type = "oneshot"; + wantedBy = [ "default.target" ]; }; }; }; diff --git a/nixos/tests/user-activation-scripts.nix b/nixos/tests/user-activation-scripts.nix index 4abae3b9d35..0de8664c5ef 100644 --- a/nixos/tests/user-activation-scripts.nix +++ b/nixos/tests/user-activation-scripts.nix @@ -25,9 +25,9 @@ import ./make-test-python.nix ({ lib, ... }: { machine.send_chars("pass1\n") machine.send_chars("touch login-ok\n") machine.wait_for_file("/home/alice/login-ok") - verify_user_activation_run_count(0) # Wrong! Should be 1 + verify_user_activation_run_count(1) machine.succeed("/run/current-system/bin/switch-to-configuration test") - verify_user_activation_run_count(1) # Wrong! Should be 2 + verify_user_activation_run_count(2) ''; }) |