------------------------------------------------------------
revno: 14
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2014-01-10 12:08:18 +0000
message:
auto update
modified:
etc/init/apport.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 2013-11-18 12:42:03 +0000
+++ etc/init/apport.conf 2014-01-10 12:08:18 +0000
@@ -11,6 +11,9 @@
env enabled=1
pre-start script
+ # don't start in containers
+ grep -zqs '^container=' /proc/1/environ && exit 0
+
. /etc/default/apport
[ "$enabled" = "1" ] || [ "$force_start" = "1" ] || exit 0
@@ -30,11 +33,14 @@
rm -f /var/lib/pm-utils/resume-hang.log
fi
- echo "|/usr/share/apport/apport %p %s %c" > /proc/sys/kernel/core_pattern
+ echo "|/usr/share/apport/apport %p %s %c %P" > /proc/sys/kernel/core_pattern
echo 2 > /proc/sys/fs/suid_dumpable
end script
post-stop script
+ # don't stop in containers
+ grep -zqs '^container=' /proc/1/environ && exit 0
+
# Check for a hung resume. If we find one try and grab everything
# we can to aid in its discovery
if [ -e /var/lib/pm-utils/status ]
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
