Merge pull request #39717 from peterhoeg/f/container

nixos-container: support restarts
This commit is contained in:
Peter Hoeg 2018-05-02 07:33:42 +00:00 committed by GitHub
commit 236a9189e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -242,11 +242,21 @@ sub terminateContainer {
while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) }
}
sub startContainer {
system("systemctl", "start", "container\@$containerName") == 0
or die "$0: failed to start container\n";
}
sub stopContainer {
system("systemctl", "stop", "container\@$containerName") == 0
or die "$0: failed to stop container\n";
}
sub restartContainer {
stopContainer;
startContainer;
}
# Run a command in the container.
sub runInContainer {
my @args = @_;
@ -285,9 +295,12 @@ if ($action eq "destroy") {
unlink($confFile) or die;
}
elsif ($action eq "restart") {
restartContainer;
}
elsif ($action eq "start") {
system("systemctl", "start", "container\@$containerName") == 0
or die "$0: failed to start container\n";
startContainer;
}
elsif ($action eq "stop") {