diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-15 03:35:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-15 04:06:01 +0200 |
| commit | e6c00e60c3eb6ba390e2081818d7ac30c916d3e0 (patch) | |
| tree | 65e22243d718508abcd03810e6497a4b720bf21b /nixos | |
| parent | 82666653d2be41b1fcf9cb4e54eedefd95860405 (diff) | |
| download | nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.tar nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.tar.gz nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.tar.bz2 nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.tar.lz nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.tar.xz nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.tar.zst nixlib-e6c00e60c3eb6ba390e2081818d7ac30c916d3e0.zip | |
nixos-container destroy: Make idempotent
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/nixos-container.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index c0d30346e568..c6a5ecde9e32 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -154,7 +154,10 @@ 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; +if (!-e $confFile) { + exit 0 if $action eq "destroy"; + die "$0: container ‘$containerName’ does not exist\n" ; +} sub isContainerRunning { my $status = `systemctl show 'container\@$containerName'`; |