Merge pull request #67232 from ck3d/container-useHostResolvConf

machinectl compliant NixOS installation
2019-09-25 09:34:17 +00:00
parent fb6595eafd db9b5f5525
commit 66967ec752
7 changed files with 103 additions and 2 deletions
@@ -184,7 +184,14 @@ 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