------------------------------------------------------------
revno: 35
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2014-02-14 12:07:52 +0000
message:
auto update
modified:
etc/init/cgmanager.conf
etc/init/lxc-net.conf
etc/init/ssh.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-02-06 12:07:42 +0000
+++ etc/init/cgmanager.conf 2014-02-14 12:07:52 +0000
@@ -6,7 +6,7 @@
# 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 mounted MOUNTPOINT=/sys/fs/cgroup
+start on mounted MOUNTPOINT=/sys/fs/cgroup or virtual-filesystems
# to get debug output into /var/log/upstart/cgmanager.log, create/edit
# /etc/default/cgmanager and set cgmanager_opts="--debug"
=== modified file 'etc/init/lxc-net.conf'
--- etc/init/lxc-net.conf 2014-02-07 12:08:31 +0000
+++ etc/init/lxc-net.conf 2014-02-14 12:07:52 +0000
@@ -12,7 +12,7 @@
env LXC_DHCP_RANGE="10.0.3.2,10.0.3.254"
env LXC_DHCP_MAX="253"
env LXC_DHCP_CONFILE=""
-env varrun="/var/run/lxc"
+env varrun="/run/lxc"
env LXC_DOMAIN=""
pre-start script
=== modified file 'etc/init/ssh.conf'
--- etc/init/ssh.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ssh.conf 2014-02-14 12:07:52 +0000
@@ -20,7 +20,6 @@
pre-start script
test -x /usr/sbin/sshd || { stop; exit 0; }
test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
- test -c /dev/null || { stop; exit 0; }
mkdir -p -m0755 /var/run/sshd
end script
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
