summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-15 11:26:16 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-15 12:07:24 +0200
commit35bf0f48107d973a584c635219e098d837c8183e (patch)
tree660a7c921e8a8a6fc5840e62fb88d1f7eaaac467 /nixos/modules/virtualisation
parent596bd3716366ac497e5b12668e9fff7b7aa9e30c (diff)
downloadnixlib-35bf0f48107d973a584c635219e098d837c8183e.tar
nixlib-35bf0f48107d973a584c635219e098d837c8183e.tar.gz
nixlib-35bf0f48107d973a584c635219e098d837c8183e.tar.bz2
nixlib-35bf0f48107d973a584c635219e098d837c8183e.tar.lz
nixlib-35bf0f48107d973a584c635219e098d837c8183e.tar.xz
nixlib-35bf0f48107d973a584c635219e098d837c8183e.tar.zst
nixlib-35bf0f48107d973a584c635219e098d837c8183e.zip
Don't restart container-startup-done
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/container-config.nix1
-rw-r--r--nixos/modules/virtualisation/containers.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 697c53ce7a20..da80e44f2c31 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -99,6 +99,7 @@ with lib;
           '';
         serviceConfig.Type = "oneshot";
         serviceConfig.RemainAfterExit = true;
+        restartIfChanged = false;
       };
 
   };
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 51402f3e32de..72462a8dfd88 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -225,6 +225,7 @@ in
             # writes something to this pipe.  FIXME: it also hangs
             # until the start timeout expires if systemd-nspawn exits.
             read x < $root/var/lib/startup-done
+            rm -f $root/var/lib/startup-done
           '';
 
         preStop =