public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-container run: Execute command using ‘su’

Browse Source 
This ensures that the environment is set up correctly.
This commit is contained in:
Eelco Dolstra 2014-08-27 21:12:18 +02:00
parent 6773babd5b
commit 21ab4e054c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/virtualisation/nixos-container.pl
View File

@ -197,8 +197,7 @@ sub getLeader {
sub runInContainer { sub runInContainer {
my @args = @_; my @args = @_;
my $leader = getLeader; my $leader = getLeader;
# FIXME: initialise the environment properly. exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", "env", "-i", "--", @args);
die "cannot run ‘nsenter’: $!\n"; die "cannot run ‘nsenter’: $!\n";
} }
@ -251,12 +250,14 @@ elsif ($action eq "login") {
} }
elsif ($action eq "root-login") { elsif ($action eq "root-login") {
runInContainer("bash", "--login"); runInContainer("su", "root", "-l");
} }
elsif ($action eq "run") { elsif ($action eq "run") {
shift @ARGV; shift @ARGV; shift @ARGV; shift @ARGV;
runInContainer(@ARGV); # Escape command.
my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV);
runInContainer("su", "root", "-l", "-c", "exec " . $s);
} }
elsif ($action eq "show-ip") { elsif ($action eq "show-ip") {