------------------------------------------------------------
revno: 62
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sat 2014-04-12 12:09:57 +0100
message:
auto update
modified:
etc/init/wait-for-state.conf
lib/systemd/systemd-logind
lib/systemd/systemd-udevd
usr/share/upstart/sessions/application-click.conf
usr/share/upstart/sessions/logrotate.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/wait-for-state.conf'
--- etc/init/wait-for-state.conf 2014-03-12 12:07:43 +0000
+++ etc/init/wait-for-state.conf 2014-04-12 11:09:57 +0000
@@ -26,7 +26,7 @@
# XXX: initctl show-config should share manual w/ us too
case $MANUAL_OVERRIDE in
N|n|0)
- if grep -q "^\s*manual\s*$" /etc/init/$WAIT_FOR.conf /etc/init/$WAIT_FOR.override ; then
+ if grep -q "^\s*manual\s*$" /etc/init/$WAIT_FOR.conf /etc/init/$WAIT_FOR.override 2>/dev/null; then
exit 0
fi
;;
=== modified file 'lib/systemd/systemd-logind'
Binary files lib/systemd/systemd-logind 2014-04-11 11:10:05 +0000 and lib/systemd/systemd-logind 2014-04-12 11:09:57 +0000 differ
=== modified file 'lib/systemd/systemd-udevd'
Binary files lib/systemd/systemd-udevd 2014-04-11 11:10:05 +0000 and lib/systemd/systemd-udevd 2014-04-12 11:09:57 +0000 differ
=== modified file 'usr/share/upstart/sessions/application-click.conf'
--- usr/share/upstart/sessions/application-click.conf 2014-02-09 12:08:51 +0000
+++ usr/share/upstart/sessions/application-click.conf 2014-04-12 11:09:57 +0000
@@ -12,6 +12,7 @@
env APP_DIR
# For Surface Flinger
env APP_DESKTOP_FILE
+env APP_PROCESS_GROUP
env UPSTART_APP_LAUNCH_ARCH="i386-linux-gnu"
export UPSTART_APP_LAUNCH_ARCH
@@ -29,5 +30,12 @@
# Remember, this is confined
exec /usr/lib/i386-linux-gnu/upstart-app-launch/exec-line-exec
-post-start exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app open
-post-stop exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app close
+post-start script
+ initctl set-env APP_PROCESS_GROUP=`upstart-app-pid ${APP_ID}`
+ /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app open
+end script
+
+post-stop script
+ pkill -KILL -g "${APP_PROCESS_GROUP}" || true
+ /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app close
+end script
=== modified file 'usr/share/upstart/sessions/logrotate.conf'
--- usr/share/upstart/sessions/logrotate.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/logrotate.conf 2014-04-12 11:09:57 +0000
@@ -7,11 +7,13 @@
description "Rotate job log files"
-start on startup
+start on startup or :sys:rotate-logs
+
+task
pre-start script
-logrotate=$(command -v logrotate)
+logrotate=$(command -v logrotate 2>/dev/null || :)
# logrotate is not installed
[ -z "$logrotate" ] && exit 0
@@ -27,7 +29,7 @@
script
# started by event, so allow time for main jobs to settle
-[ -n "$UPSTART_EVENTS" ] && sleep 60
+[ -n "$UPSTART_EVENTS" ] && [ "$UPSTART_EVENTS" = startup ] && sleep 60
statedir=${XDG_CACHE_HOME:-$HOME/.cache}/logrotate
statefile="$statedir/status"
@@ -41,7 +43,7 @@
cat <<EOF >$conf
"$logdir/*.log" {
- daily
+ hourly
missingok
rotate 7
compress
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
