Simplify the upstart job

This fixes the nesting case as before it would hit the first check,
which stops the job, then post-stop would unmount it.

Instead, lets just not start in containers, lxcfs is meant to run on the
host and be bind-mounted from there into containers.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/config/init/upstart/lxcfs.conf b/config/init/upstart/lxcfs.conf
index 0a6d7d3a09f723fff0f71dea088a1ce059022bac..1252b2c8feff2bbd597e2464bd16c03e8e0990a3 100644 (file)
--- a/config/init/upstart/lxcfs.conf
+++ b/config/init/upstart/lxcfs.conf
@@ -1,15 +1,11 @@
 description "FUSE filesystem for LXC"
 author "Stéphane Graber <stgraber@ubuntu.com>"
 
-start on starting lxc or runlevel [2345]
+start on not-container and (starting lxc or runlevel [2345])
 stop on runlevel [06]
 
 respawn
 
-pre-start script
-    [ ! -d /var/lib/lxcfs/proc ] || { stop; exit 0; }
-end script
-
 exec /usr/bin/lxcfs /var/lib/lxcfs
 
 post-stop script