diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-21 16:45:47 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-21 16:51:08 +0100 |
| commit | cb49c1432417f9576ed12613f0374b3bc23587c2 (patch) | |
| tree | 04207d60d54b794a18549fe82a2fbcff1bbfda3b /pkgs/tools/virtualization/nixos-container/default.nix | |
| parent | 02129a8788423cb0b3dd4248c1ae342866d0d7ad (diff) | |
Revert "nixos-container: Use machinectl shell (#18825)"
This reverts commit
c37e76b4d2ac59139df8956cc2b1ec6921bea11d. Unfortunately, using
"machinectl shell" has two bad side effects:
* It sends the command's stderr to stdout.
* It doesn't propagate the command's exit status.
This broke NixOps.
PR #18825.
Diffstat (limited to 'pkgs/tools/virtualization/nixos-container/default.nix')
| -rw-r--r-- | pkgs/tools/virtualization/nixos-container/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 19394ea45d30..0763536533f0 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -6,6 +6,8 @@ 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 |