diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-01 21:52:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-01 21:52:19 +0300 |
| commit | 90204f058ce07088cec0ec7040cd68c9afd1b958 (patch) | |
| tree | ab9943dda6fc664cc6323cbb766010b22a0b078d /nixos | |
| parent | 06af5be0144223488d7b13de8b170e8c6430b181 (diff) | |
| parent | e39c9f13bcf8fe680d3bedcc35a121aede1cc0d8 (diff) | |
Merge pull request #251684 from jmbaur/user-activation-tmpfiles
nixos/systemd-user: call systemd-tmpfiles during activation
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd/user.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/user-activation-scripts.nix | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix index 1b6398d2f929e..64dc19633eca9 100644 --- a/nixos/modules/system/boot/systemd/user.nix +++ b/nixos/modules/system/boot/systemd/user.nix @@ -230,5 +230,9 @@ in { }); }) cfg.tmpfiles.users; + + system.userActivationScripts.tmpfiles = '' + ${config.systemd.package}/bin/systemd-tmpfiles --user --create --remove + ''; }; } diff --git a/nixos/tests/user-activation-scripts.nix b/nixos/tests/user-activation-scripts.nix index 5df072ce0508a..ebd96b019e920 100644 --- a/nixos/tests/user-activation-scripts.nix +++ b/nixos/tests/user-activation-scripts.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ lib, ... }: { initialPassword = "pass1"; isNormalUser = true; }; + systemd.user.tmpfiles.users.alice.rules = [ "r %h/file-to-remove" ]; }; testScript = '' @@ -27,7 +28,9 @@ import ./make-test-python.nix ({ lib, ... }: { machine.wait_for_file("/home/alice/login-ok") verify_user_activation_run_count(1) + machine.succeed("touch /home/alice/file-to-remove") machine.succeed("/run/current-system/bin/switch-to-configuration test") verify_user_activation_run_count(2) + machine.succeed("[[ ! -f /home/alice/file-to-remove ]] || false") ''; }) |