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

Merge pull request #17484 from srp/nixos-container-terminate

Browse Source 
nixos-container: add 'terminate' command which 'destroy' now uses
This commit is contained in:
Joachim F 2016-08-05 23:03:38 +02:00 committed by GitHub
commit dece583a94
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/virtualization/nixos-container/nixos-container.pl
View File

@ -23,7 +23,7 @@ Usage: nixos-container list
nixos-container destroy <container-name> nixos-container destroy <container-name>
nixos-container start <container-name> nixos-container start <container-name>
nixos-container stop <container-name> nixos-container stop <container-name>
nixos-container kill <container-name> [--signal <signal-specifier>] nixos-container terminate <container-name>
nixos-container status <container-name> nixos-container status <container-name>
nixos-container update <container-name> [--config <string>] [--config-file <path>] nixos-container update <container-name> [--config <string>] [--config-file <path>]
nixos-container login <container-name> nixos-container login <container-name>
@ -210,12 +210,9 @@ sub isContainerRunning {
return $status =~ /ActiveState=active/; return $status =~ /ActiveState=active/;
} }
sub killContainer { sub terminateContainer {
my @args = (); system("machinectl", "terminate", $containerName) == 0
push(@args, ("--signal", $signal)) if ($signal ne ""); or die "$0: failed to terminate container\n";
system("machinectl", "kill", $containerName, @args) == 0
or die "$0: failed to kill container\n";
} }
sub stopContainer { sub stopContainer {
@ -260,8 +257,7 @@ if ($action eq "destroy") {
die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n" die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n"
unless POSIX::access($confFile, &POSIX::W_OK); unless POSIX::access($confFile, &POSIX::W_OK);
$signal = "SIGKILL"; terminateContainer if (isContainerRunning);
killContainer if (isContainerRunning);
safeRemoveTree($profileDir) if -e $profileDir; safeRemoveTree($profileDir) if -e $profileDir;
safeRemoveTree($gcRootsDir) if -e $gcRootsDir; safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
@ -278,8 +274,8 @@ elsif ($action eq "stop") {
stopContainer; stopContainer;
} }
elsif ($action eq "kill") { elsif ($action eq "terminate") {
killContainer; terminateContainer;
} }
elsif ($action eq "status") { elsif ($action eq "status") {