------------------------------------------------------------
revno: 30
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Thu 2014-02-06 12:07:42 +0000
message:
auto update
added:
etc/init/cgproxy.conf
modified:
etc/init/cgmanager.conf
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init/cgmanager.conf'
--- etc/init/cgmanager.conf 2014-01-22 12:08:26 +0000
+++ etc/init/cgmanager.conf 2014-02-06 12:07:42 +0000
@@ -12,17 +12,15 @@
# /etc/default/cgmanager and set cgmanager_opts="--debug"
env cgmanager_opts=""
+pre-start script
+ # check whether we should start a cgproxy or a cgmanager
+ if cgproxy --check-master; then
+ start cgproxy NESTED=yes || true && { stop; exit 0; }
+ fi
+end script
+
script
[ -r /etc/default/cgmanager ] && . /etc/default/cgmanager
- test -x /sbin/cgmanager || { stop; exit 0; }
- # check whether we should start a cgproxy or a cgmanager
- if /sbin/cgproxy --check-master; then
- exec /sbin/cgproxy $cgmanager_opts
- else
- exec /sbin/cgmanager $cgmanager_opts
- fi
-end script
-post-stop script
- rm /sys/fs/cgroup/cgmanager/sock || true
+ exec cgmanager $cgmanager_opts
end script
=== added file 'etc/init/cgproxy.conf'
--- etc/init/cgproxy.conf 1970-01-01 00:00:00 +0000
+++ etc/init/cgproxy.conf 2014-02-06 12:07:42 +0000
@@ -0,0 +1,27 @@
+description "cgroup management proxy"
+author "Serge Hallyn <[email protected]>"
+
+respawn
+
+# in trusty /sys/fs/cgroup will be mounted for us.
+# prior to saucy, we would need to start on mounted
+# MOUNTPOINT=/sys, and mount /sys/fs/cgroup ourselves
+start on started cgmanager
+
+# to get debug output into /var/log/upstart/cgproxy.log, create/edit
+# /etc/default/cgmanager and set cgmanager_opts="--debug"
+env cgmanager_opts=""
+env NESTED="no"
+
+pre-start script
+ # check whether we should start
+ if [ -e /proc/self/ns/pid ] && [ "$NESTED" = "no" ]; then
+ { stop; exit 0; }
+ fi
+end script
+
+script
+ [ -r /etc/default/cgmanager ] && . /etc/default/cgmanager
+
+ exec cgproxy $cgmanager_opts
+end script
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
