Revert "Merge #67232: machinectl compliant NixOS installation"

This reverts commit 66967ec752, reversing changes made to fb6595eafd. Fixes #70442; discussion: https://github.com/NixOS/nixpkgs/pull/70027
2019-10-07 20:56:59 +02:00
parent 56e1ea32f4
commit f760f0ef48
7 changed files with 2 additions and 103 deletions
@@ -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