From 859f049d1b813e71dfb17ffd8e5189d2964d122d Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Sep 2014 16:54:24 +0200 Subject: [PATCH] containers: Remove check for var/lib/startup-done. Fixes a leftover from 330fadb7060074bd5c38e5dcefc394abaf8d6a09. We're using systemd dbus notifications now and this leftover caused the startup notification to fail. Signed-off-by: aszlig --- nixos/modules/virtualisation/containers.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 35455f17779..35e37257838 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -245,12 +245,6 @@ in ip route add $LOCAL_ADDRESS dev $ifaceHost fi fi - - # This blocks until the container-startup-done service - # 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 =