diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-09-11 16:54:24 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-09-11 18:12:35 +0200 |
| commit | 859f049d1b813e71dfb17ffd8e5189d2964d122d (patch) | |
| tree | 532713e9435233ee2f225a38dd84ce1024b602bb /nixos | |
| parent | bc6b180d909b2f67a3d3db173b3eb889304df85c (diff) | |
| download | nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.tar nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.tar.gz nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.tar.bz2 nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.tar.lz nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.tar.xz nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.tar.zst nixlib-859f049d1b813e71dfb17ffd8e5189d2964d122d.zip | |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 35455f17779f..35e37257838e 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 = |