diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
| commit | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch) | |
| tree | 96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /nixos/modules/system/activation/activation-script.nix | |
| parent | 0913e30c859f0071d0f0529c309d4256713acc41 (diff) | |
| parent | 60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff) | |
| download | nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2 nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst nixlib-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/activation/activation-script.nix')
| -rw-r--r-- | nixos/modules/system/activation/activation-script.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 2f716f92c62e..ddfd1af4a319 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -184,14 +184,7 @@ in find /var/empty -mindepth 1 -delete chmod 0555 /var/empty chown root:root /var/empty - - ${ # reasons for not setting immutable flag: - # 1. flag is not changeable inside a container - # 2. systemd-nspawn can not perform chown in case of --private-users-chown - # then the owner is nobody and ssh will not start - optionalString (!config.boot.isContainer) '' ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true - ''} ''; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null |