Merge remote-tracking branch 'origin/master' into staging

2014-08-15 02:15:14 +02:00
parent 36bef2b267 785ed2b528
commit df7bc53606
61 changed files with 5206 additions and 529 deletions
@@ -152,6 +152,7 @@ if ($action eq "create") {

 my $root = "/var/lib/containers/$containerName";
 my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
+my $gcRootsDir = "/nix/var/nix/gcroots/per-container/$containerName";
 my $confFile = "/etc/containers/$containerName.conf";
 die "$0: container ‘$containerName’ does not exist\n" if !-e $confFile;

@@ -172,6 +173,7 @@ if ($action eq "destroy") {
    stopContainer if isContainerRunning;

    rmtree($profileDir) if -e $profileDir;
+    rmtree($gcRootsDir) if -e $gcRootsDir;
    rmtree($root) if -e $root;
    unlink($confFile) or die;
 }