From 8f95e6f6aa8ac62e809a5d1cba6af2b6707d90dd Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Wed, 7 Sep 2016 10:41:56 +0200 Subject: hardcode e2fsprogs, idempotent chmod, remove care condition --- nixos/modules/system/activation/activation-script.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'nixos/modules/system') diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 47550ae76a66..60298362d767 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -19,7 +19,6 @@ let glibc # needed for getent shadow nettools # needed for hostname - e2fsprogs # needed for chattr ]; in @@ -140,13 +139,13 @@ in mkdir -m 1777 -p /var/tmp + # Empty, immutable home directory of many system accounts. + mkdir -p /var/empty # Make sure it's really empty - chattr -i /var/empty - rm -rf /var/empty - - # Empty, read-only home directory of many system accounts. - mkdir -m 0555 -p /var/empty - chattr +i /var/empty + ${pkgs.e2fsprogs}/bin/chattr -i /var/empty + find /var/empty -mindepth 1 -delete + chmod 0555 /var/empty + ${pkgs.e2fsprogs}/bin/chattr +i /var/empty ''; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null -- cgit 1.4.1