diff options
| author | nikstur <nikstur@outlook.com> | 2023-10-17 17:35:16 +0200 |
|---|---|---|
| committer | nikstur <nikstur@outlook.com> | 2023-10-25 00:48:37 +0200 |
| commit | 59e37267556eb917146ca3110ab7c96905b9ffbd (patch) | |
| tree | 1b9cfa0456ab8af2f0296cfa9f4e1679c508f92a /nixos/modules/system | |
| parent | 3c1c4b65e9eaf68e49113cba5dfe6750596fc86f (diff) | |
| download | nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.tar nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.tar.gz nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.tar.bz2 nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.tar.lz nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.tar.xz nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.tar.zst nixpkgs-59e37267556eb917146ca3110ab7c96905b9ffbd.zip | |
nixos/activation: replace var activationScript via tmpfiles
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/activation/activation-script.nix | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index c8407dd6779..c62e3933405 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -233,23 +233,12 @@ in config = { system.activationScripts.stdio = ""; # obsolete + system.activationScripts.var = ""; # obsolete - system.activationScripts.var = - '' - # Various log/runtime directories. - - mkdir -p /var/tmp - chmod 1777 /var/tmp - - # Empty, immutable home directory of many system accounts. - mkdir -p /var/empty - # Make sure it's really empty - ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true - find /var/empty -mindepth 1 -delete - chmod 0555 /var/empty - chown root:root /var/empty - ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true - ''; + systemd.tmpfiles.rules = [ + "D /var/empty 0555 root root -" + "h /var/empty - - - - +i" + ]; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null then '' |