diff options
author | Wilhelm Schuster <ws@wilhelm.re> | 2016-09-24 00:40:41 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-24 00:40:41 +0200 |
commit | c37e76b4d2ac59139df8956cc2b1ec6921bea11d (patch) | |
tree | 40995c5a3a54a88042728d66f480878e100724fb /pkgs/tools/virtualization/nixos-container/default.nix | |
parent | 84f7009994b9ac8d591de30615059967f2ef2591 (diff) |
nixos-container: Use machinectl shell (#18825)
Using nsenter+su was suboptimal since the environment they provided was
not quite the same as the real container environment. See [1] for more
background.
Note that we directly invoke /bin/sh for `nixos-container root-login`
since setting the user's shell is quite complex. See [2] for a related
systemd issue.
[1]: https://github.com/systemd/systemd/issues/825#issuecomment-127917622
[2]: https://github.com/systemd/systemd/issues/1395
Diffstat (limited to 'pkgs/tools/virtualization/nixos-container/default.nix')
-rw-r--r-- | pkgs/tools/virtualization/nixos-container/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 0763536533f0..19394ea45d30 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -6,8 +6,6 @@ substituteAll { isExecutable = true; src = ./nixos-container.pl; perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl"; - su = "${shadow.su}/bin/su"; - inherit utillinux; postInstall = '' t=$out/etc/bash_completion.d |