alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #67332 from uvNikita/nixos-container/run

Browse source 
nixos-container: use systemd-run instead of nsenter
This commit is contained in:
Franz Pletz 2019-09-14 13:22:35 +00:00 committed by GitHub
parent 0b32f6f78c 7cb100b683
commit a0a3f5c86c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/virtualization/nixos-container/nixos-container.pl
View file

@ -9,7 +9,6 @@ use Getopt::Long qw(:config gnu_getopt);
use Cwd 'abs_path';
use Time::HiRes;
my $nsenter = "@utillinux@/bin/nsenter";
my $su = "@su@";
# Ensure a consistent umask.
@ -270,9 +269,10 @@ sub restartContainer {
# Run a command in the container.
sub runInContainer {
my @args = @_;
my $leader = getLeader;
exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
die "cannot run ‘nsenter’: $!\n";
exec("systemd-run", "--machine", $containerName, "--pty", "--quiet", "--", @args);
die "cannot run ‘systemd-run’: $!\n";
}
# Remove a directory while recursively unmounting all mounted filesystems within