------------------------------------------------------------
revno: 22
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sat 2014-01-25 12:07:45 +0000
message:
auto update
modified:
etc/init/apport.conf
etc/init/ceilometer-agent-central.conf
etc/init/ceilometer-agent-compute.conf
etc/init/ceilometer-agent-notification.conf
etc/init/ceilometer-api.conf
etc/init/ceilometer-collector.conf
etc/init/modemmanager.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/apport.conf'
--- etc/init/apport.conf 2014-01-10 12:08:18 +0000
+++ etc/init/apport.conf 2014-01-25 12:07:45 +0000
@@ -12,7 +12,7 @@
pre-start script
# don't start in containers
- grep -zqs '^container=' /proc/1/environ && exit 0
+ /bin/running-in-container && exit 0
. /etc/default/apport
[ "$enabled" = "1" ] || [ "$force_start" = "1" ] || exit 0
@@ -39,7 +39,7 @@
post-stop script
# don't stop in containers
- grep -zqs '^container=' /proc/1/environ && exit 0
+ /bin/running-in-container && exit 0
# Check for a hung resume. If we find one try and grab everything
# we can to aid in its discovery
=== modified file 'etc/init/ceilometer-agent-central.conf'
--- etc/init/ceilometer-agent-central.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceilometer-agent-central.conf 2014-01-25 12:07:45 +0000
@@ -2,7 +2,7 @@
author "Chuck Short <[email protected]>"
start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
chdir /var/run
=== modified file 'etc/init/ceilometer-agent-compute.conf'
--- etc/init/ceilometer-agent-compute.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceilometer-agent-compute.conf 2014-01-25 12:07:45 +0000
@@ -2,7 +2,7 @@
author "Chuck Short <[email protected]>"
start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
chdir /var/run
=== modified file 'etc/init/ceilometer-agent-notification.conf'
--- etc/init/ceilometer-agent-notification.conf 2013-12-13 18:38:08 +0000
+++ etc/init/ceilometer-agent-notification.conf 2014-01-25 12:07:45 +0000
@@ -2,7 +2,7 @@
author "Yolanda Robla <[email protected]>"
start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
chdir /var/run
=== modified file 'etc/init/ceilometer-api.conf'
--- etc/init/ceilometer-api.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceilometer-api.conf 2014-01-25 12:07:45 +0000
@@ -2,7 +2,7 @@
author "Chuck Short <[email protected]>"
start on runlevel [2345]
-stop on runlelvel [016]
+stop on runlevel [016]
chdir /var/run
=== modified file 'etc/init/ceilometer-collector.conf'
--- etc/init/ceilometer-collector.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceilometer-collector.conf 2014-01-25 12:07:45 +0000
@@ -2,7 +2,7 @@
author "Chuck Short <[email protected]>"
start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
chdir /var/run
=== modified file 'etc/init/modemmanager.conf'
--- etc/init/modemmanager.conf 2013-11-18 12:42:03 +0000
+++ etc/init/modemmanager.conf 2014-01-25 12:07:45 +0000
@@ -11,7 +11,7 @@
respawn
pre-start script
- [ -x /usr/sbin/modem-manager ] || stop
+ [ -x /usr/sbin/ModemManager ] || stop
end script
-exec /usr/sbin/modem-manager
+exec /usr/sbin/ModemManager
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
