summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-09-21 10:29:04 +0200
committerDomen Kožar <domen@dev.si>2016-09-21 10:29:14 +0200
commit80437576f942d1817bc8285dd59b4b91a9476a82 (patch)
tree23ceec37f1994fc53868c84359a2326d040ca4d3 /nixos/modules
parentdfadfdd01890e3cb4eed363932abd5393dd82078 (diff)
downloadnixlib-80437576f942d1817bc8285dd59b4b91a9476a82.tar
nixlib-80437576f942d1817bc8285dd59b4b91a9476a82.tar.gz
nixlib-80437576f942d1817bc8285dd59b4b91a9476a82.tar.bz2
nixlib-80437576f942d1817bc8285dd59b4b91a9476a82.tar.lz
nixlib-80437576f942d1817bc8285dd59b4b91a9476a82.tar.xz
nixlib-80437576f942d1817bc8285dd59b4b91a9476a82.tar.zst
nixlib-80437576f942d1817bc8285dd59b4b91a9476a82.zip
/var/empty: silently ignore errors (if on tmpfs) #18781
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/system/activation/activation-script.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 60298362d767..4c3d30e346c5 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -142,10 +142,10 @@ in
         # Empty, immutable home directory of many system accounts.
         mkdir -p /var/empty
         # Make sure it's really empty
-        ${pkgs.e2fsprogs}/bin/chattr -i /var/empty
+        ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true
         find /var/empty -mindepth 1 -delete
         chmod 0555 /var/empty
-        ${pkgs.e2fsprogs}/bin/chattr +i /var/empty
+        ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true
       '';
 
     system.activationScripts.usrbinenv = if config.environment.usrbinenv != null