--- upstart-1.13.2.orig/ChangeLog +++ upstart-1.13.2/ChangeLog @@ -1,3 +1,48 @@ +2015-05-12 James Hunt + + * init/log.c: + - log_clear_unflushed(): Handle logs on the unflushed list which + get flushed automatically by their corresponding NihIo before + a request to clear the unflushed list is made. This scenario + is triggered when a job which has spawned processes exits, but + where the spawned processes continue to run and then produce + output before the request to clear the unflushed list is made + (at the time the log partition becomes writable) but after the + log partition becomes writable (LP: #1447756). + * init/tests/test_log.c: + - test_log_new(): Added new test: + "ensure logger unflushed list ignores already flushed data". + - test_log_destroy(): Improved test + "ensure unflushed data moved to unflushed list with uid 0" by giving + the log a parent and checking parent handling behaviour. + +2015-04-24 James Hunt + + * init/log.c: + - Make log_flushed public to allow tests to test + log_handle_unflushed() properly. + - log_handle_unflushed(): + - Make log a child of the list entry and the latter a child of the + unflushed list. + - log_clear_unflushed(): + - Ensure the list entry is freed along with the log to avoid an + invalid entry remaining in the list (LP: #1447756). + * init/tests/test_log.c: + - test_log_destroy(): Added new test: + - "ensure unflushed data moved to unflushed list with uid 0" + +2014-09-08 James Hunt + + * util/telinit.c: Remove UPSTART_TELINIT_U_NO_WAIT check as it + shouldn't realistically be needed. + +2014-08-21 James Hunt + + * util/telinit.c: restart_upstart(): + - Revert to synchronous behaviour coupled with unavoidable + poll to ensure telinit only returns once a re-exec has + completed (LP: #901038). + 2014-09-04 James Hunt * NEWS: Release 1.13.2 --- upstart-1.13.2.orig/conf/rc-sysinit.conf +++ upstart-1.13.2/conf/rc-sysinit.conf @@ -6,7 +6,7 @@ description "System V initialisation compatibility" author "Scott James Remnant " -start on startup +start on (filesystem and static-network-up) or failsafe-boot stop on runlevel # Default runlevel, this may be overriden on the kernel command-line @@ -23,9 +23,11 @@ env RUNLEVEL= env PREVLEVEL= +console output +env INIT_VERBOSE + task -console owner script # Check for default runlevel in /etc/inittab if [ -r /etc/inittab ] --- upstart-1.13.2.orig/conf/rc.conf +++ upstart-1.13.2/conf/rc.conf @@ -6,13 +6,23 @@ description "System V runlevel compatibility" author "Scott James Remnant " +emits deconfiguring-networking +emits unmounted-remote-filesystems + start on runlevel [0123456] stop on runlevel [!$RUNLEVEL] export RUNLEVEL export PREVLEVEL +console output +env INIT_VERBOSE + task -console output -exec /etc/init.d/rc $RUNLEVEL +script +if [ "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" -o "$RUNLEVEL" = "6" ]; then + status plymouth-shutdown 2>/dev/null >/dev/null && start wait-for-state WAITER=rc WAIT_FOR=plymouth-shutdown || : +fi +/etc/init.d/rc $RUNLEVEL +end script --- upstart-1.13.2.orig/configure.ac +++ upstart-1.13.2/configure.ac @@ -8,7 +8,7 @@ AC_GNU_SOURCE -AM_INIT_AUTOMAKE([1.10 gnu nostdinc check-news color-tests silent-rules]) +AM_INIT_AUTOMAKE([1.10 gnu nostdinc check-news color-tests silent-rules serial-tests]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE([enable]) @@ -119,6 +119,15 @@ AM_CONDITIONAL([HAVE_ABI_CHECKER], [test ! -z "$ABI_COMPLIANCE_CHECKER" && test -e "$srcdir"/lib/abi/"$host_cpu"-"$host_os"/*.abi]) +AC_ARG_ENABLE(selinux, + AS_HELP_STRING([--enable-selinux], [enable SELinux support]), + [], [enable_selinux=no]) + +if test "x$enable_selinux" = "xyes" ; then + PKG_CHECK_MODULES(SELINUX, [libselinux]) + AC_DEFINE(HAVE_SELINUX, 1, [Define if we have SELinux]) +fi + # Checks for header files. AC_CHECK_HEADERS([valgrind/valgrind.h, sys/prctl.h]) --- upstart-1.13.2.orig/dbus/Makefile.am +++ upstart-1.13.2/dbus/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = \ upstart.h \ + org.freedesktop.DBus.xml \ com.ubuntu.Upstart.xml \ com.ubuntu.Upstart.Job.xml \ com.ubuntu.Upstart.Instance.xml --- upstart-1.13.2.orig/dbus/org.freedesktop.DBus.xml +++ upstart-1.13.2/dbus/org.freedesktop.DBus.xml @@ -0,0 +1,9 @@ + + + + + + + + --- upstart-1.13.2.orig/debian/README.Debian +++ upstart-1.13.2/debian/README.Debian @@ -0,0 +1,200 @@ +upstart +======= + +Upstart is a replacement for the traditional sysvinit package, and +runs as process #1. Through upstart, we are able to have an +event-driven process, whilst at the same time retaining compatibility +for the original sysvinit behaviour. + +This file documents how to do a few common operations with the new +system. + + +Where are initscripts installed? +-------------------------------- + +This has not changed, they are installed in /etc/init.d. See +/etc/init.d/README. + +Important system jobs are no longer shipped as initscripts, but as +upstart jobs. These are installed in /etc/init + + +How are initscripts started and stopped? +---------------------------------------- + +This has not changed, symlinks are made from the initscript in the +/etc/init.d directory to the /etc/rc?.d directories. See +/etc/init.d/README and /etc/rc?.d/README. + + +What order are initscripts started and stopped in? +-------------------------------------------------- + +This has not changed, the symlinks are named SNNname or KNNname, where +NN is a number from 00 to 99. The K scripts are run first in +numerical order, followed by the S scripts in numerical order. + + +How do I find the current/previous runlevel? +-------------------------------------------- + +This has not changed, use the "runlevel" command. See runlevel(8). + + +How do I change the runlevel? +----------------------------- + +This has not changed, use the "telinit" command or just invoke "init" +directly. See telinit(8). + + +How do I change the default runlevel? +------------------------------------- + +If you have an /etc/inittab file, edit it. Locate the following line: + + id:N:initdefault: + +Where N is the default runlevel, change this to match. + +Most people won't have that file, you can edit /etc/init/rc-sysinit.conf +and change the following line: + + env DEFAULT_RUNLEVEL=2 + + +How do I shutdown the machine? +------------------------------ + +This has not changed, use the "shutdown" command provided by the +upstart package; you may also use the "reboot"/"halt"/"poweroff" +commands as a short-cut. See shutdown(8) and reboot(8). + +You can also press Control-Alt-Delete on a console to reboot the +machine. + + +How do I change the behaviour of Control-Alt-Delete? +---------------------------------------------------- + +Edit the /etc/init/control-alt-delete.conf file, the line beginning +"exec" is what upstart will run when this key combination is pressed. + +To not do anything, you can simply delete this file. + + +How do I enter single-user mode? +-------------------------------- + +This hasn't changed, choose the "(recovery mode)" option from GRUB; +add "-s", "S" or "single" to the kernel command-line; or from a +running machine, run "telinit 1" or "shutdown now". + + +How do I reduce the number of gettys? +------------------------------------- + +Also see "How do I change which runlevels gettys are run in?" + +In /etc/init there is a file named ttyN.conf for each getty that will be +started, where N is numbered 1 to 6. Remove any that you do not +want. + +This will not take immediate effect, however you can run "stop ttyN" +to stop one that is running. + + +How do I change getty parameters? +--------------------------------- + +In /etc/init there is a file named ttyN.conf for each getty that will be +started, where N is numbered 1 to 6. Edit these files, the line +beginning "respawn" is what upstart will run. + +This will not take immediate effect, run "stop ttyN" followed by +"start ttyN" or just kill the running getty to respawn with the new +parameters. + + +How do I change which runlevels gettys are run in? +-------------------------------------------------- + +In /etc/init there is a file named ttyN.conf for each getty that will be +started, where N is numbered 1 to 6. Edit these files, there are two +lines: + + start on runlevel [2345] + stop on runlevel [!2345] + +Change the set of runlevels to match your taste. + +This will not take immediate effect, however you can run "stop ttyN" +to stop one that is running or "start ttyN" to start one that isn't. + + +How do I increase the number of gettys? +--------------------------------------- + +In /etc/init there is a file named ttyN.conf for each getty that will be +started, where N is numbered 1 to 6. + +Copy one of these files to a new name, we suggest you simply name it +after the tty, e.g. "ttyS0". + +Edit that file, change the "respawn" line to match your requirements; +in particular you'll need to change the tty the getty should be run +on. + +This will not take immediate effect, however you can run "start ttyN" +to start the getty. + + +How do I add a serial console? +------------------------------ + +See "How do I increase the number of gettys?" + + +How can I see boot messages on the console? +------------------------------------------- + +This is nothing to do with upstart, but I'll answer this anyway. +Remove "quiet" from the kernel command-line. + +To make this permanent, edit /boot/grub/menu.lst and edit the line +that begins "# defoptions=" (yes, it looks like a comment). + +This will change both usplash and the LSB init logging. + + +Upstart isn't working, how do I debug it? +----------------------------------------- + +Add "--debug" to the kernel command-line, and be sure to remove "quiet" +and "splash". You'll now see debugging messages as upstart works. + + +Can I query upstart for a list of jobs? +--------------------------------------- + +Yes, "initctl list" will list the known jobs and their status. + + +How do I manually start or stop a job? +-------------------------------------- + +Use "start JOB" or "stop JOB". + + +How do I find the status of a job? +---------------------------------- + +Use "status JOB". + + +Can I emit an event by hand? +---------------------------- + +Yes, "initctl emit EVENT" will emit the named event and cause any +jobs waiting for it to be started or stopped as appropriate. --- upstart-1.13.2.orig/debian/apparmor-profile-load +++ upstart-1.13.2/debian/apparmor-profile-load @@ -0,0 +1,5 @@ +#!/bin/sh + +[ -x /lib/apparmor/profile-load ] && exec /lib/apparmor/profile-load "$@" + +exit 0 --- upstart-1.13.2.orig/debian/changelog +++ upstart-1.13.2/debian/changelog @@ -0,0 +1,2224 @@ +upstart (1.13.2-0ubuntu21.1) xenial; urgency=medium + + * Cherry-pick upstream fixes to publish global session variable changes + to the dbus environment. LP: #1433013. + + -- Dimitri John Ledkov Thu, 19 May 2016 12:04:29 +0100 + +upstart (1.13.2-0ubuntu21) xenial; urgency=medium + + * init/tests/test_job_process.c: Relax assertion about output format of + "dd", as it changed recently. Fixes test failure and FTBFS. + * init/tests/test_job_process.c: Disable "exited with signal" check in "with + single-line script that is killed" test, as this is racy: it is possible + that a short lived process exits faster than we manage to kill it. This + will enable us to un-ignore autopkgtests again. + + -- Martin Pitt Mon, 29 Feb 2016 16:06:05 +0100 + +upstart (1.13.2-0ubuntu20) xenial; urgency=medium + + * Drop versioned Breaks: to init-system-helpers introduced in + 1.13.2-0ubuntu17. It can lead to dependency loops on upgrades. The + Replaces: suffices to tell dpkg about changing the ownership of + apparmor-profile-load. (LP: #1541914) + + -- Martin Pitt Mon, 29 Feb 2016 10:47:36 +0100 + +upstart (1.13.2-0ubuntu19) xenial; urgency=medium + + * Set bzr vcs to lp:~ubuntu-core-dev/upstart/ubuntu + * Do not start upstart event bridge, when pid1 is systemd LP: #1447099 + * In init-checkconf, use /sbin/upstart path + + -- Dimitri John Ledkov Wed, 03 Feb 2016 14:04:04 +0000 + +upstart (1.13.2-0ubuntu18) xenial; urgency=medium + + * apparmor-profile-load: don't fail if apparmor is not installed. + (LP: #1521931) + + -- Serge Hallyn Thu, 03 Dec 2015 20:52:54 -0600 + +upstart (1.13.2-0ubuntu17) xenial; urgency=medium + + * Put back /lib/init/apparmor-profile-load shim, as some upstart jobs still + use that instead of /lib/apparmor/profile-load. (LP: #1432683) + + -- Martin Pitt Mon, 26 Oct 2015 08:59:04 +0100 + +upstart (1.13.2-0ubuntu16) wily; urgency=medium + + * Move from libjson0-dev to libjson-c-dev. (LP: #1384886) + + -- Robert Ancell Fri, 18 Sep 2015 06:29:15 +0200 + +upstart (1.13.2-0ubuntu15) wily; urgency=medium + + * debian/user-conf/xsession-init.conf: + - Make xsession-init a task that exits immediately, rather than + a long-living process that waits for all consumers of its signal + to exit. + + -- Michael Terry Thu, 17 Sep 2015 18:12:30 -0400 + +upstart (1.13.2-0ubuntu14) wily; urgency=medium + + * Cherry-pick upstream fix for LP: #1447756, fixing broken handling + when flushing logs to disk. + * Cherry-pick follow-on upstream fix for LP: #1447756. + + -- James Hunt Mon, 18 May 2015 11:09:10 +0100 + +upstart (1.13.2-0ubuntu13) vivid; urgency=medium + + * remove running-in-container - it is moved to init-system-helpers and + made to work also with systemd. (LP: #1442228) + + -- Serge Hallyn Thu, 09 Apr 2015 18:40:12 -0500 + +upstart (1.13.2-0ubuntu12) vivid; urgency=medium + + * debian/xsession.d/99upstart: + Don't assume that /sbin is in $PATH when calling upstart + (LP: #1435492). + + -- Gunnar Hjalmarsson Fri, 03 Apr 2015 14:48:00 +0100 + +upstart (1.13.2-0ubuntu11) vivid; urgency=medium + + * Remove /lib/init/apparmor-profile-load, as it is being moved to the + init-system-helpers package. Add new dependency on init-system-helpers + to transition all current systems. (LP: #1432683) + + -- Serge Hallyn Thu, 02 Apr 2015 11:21:23 -0500 + +upstart (1.13.2-0ubuntu10) vivid; urgency=medium + + * Add upstart-sysv to mirror systemd-sysv behavior if upstart is chosen + as the default init daemon: (LP: #1422681) + - this fixes upstart not starting only with upstart-bin binary due to + missing jobs. + - upstart now contains upstart-bin binaries. + - upstart-bin is a transitional package. Can be deleted in vivid+1. + - removed some deprecated transition path for both debian and ubuntu. + - ensure grub is updated when upstart-sysv is installed. + - always get alternatives init and right default grub entries. + + -- Didier Roche Mon, 23 Mar 2015 09:51:12 +0100 + +upstart (1.13.2-0ubuntu9) vivid; urgency=medium + + * debian/upstart-bin.upstart.cron.daily: Ensure the session uid matches that + of the session file itself to stop a user forcing the logrotation of + another users logs. + + -- James Hunt Thu, 26 Feb 2015 14:35:41 +0000 + +upstart (1.13.2-0ubuntu8) vivid; urgency=medium + + * debian/upstart-bin.upstart.cron.daily: + - [SECURITY FIX]: Only consider valid session files to avoid possible + privilege escalation. Thanks to halfdog for reporting (LP: #1425685). + + -- James Hunt Thu, 26 Feb 2015 12:34:30 +0000 + +upstart (1.13.2-0ubuntu7) vivid; urgency=medium + + * Correct upstart-udev-bridge session job start/stop on conditions. + + -- Dimitri John Ledkov Tue, 20 Jan 2015 10:54:54 +0000 + +upstart (1.13.2-0ubuntu6) vivid; urgency=medium + + * debian/upstart-bin.upstart.cron.daily: Emit "rotate-logs" event direct + into session init, by-passing system upstart & session + event-bridge. This way session logs will be rotated, even upstart is + not system init. + * debian/control: make upstart-monitor & upstart-dconf-bridge be + installable with just session init, upstart-bin. + * extra/upstart-local-bridge: implement systemd pid1 logic. + * extra/upstart-event-bridge: make it re-emit upstart-local-bridge + events direct. + * util/telinit: Revert to synchronous behaviour coupled with unavoidable + poll to ensure telinit only returns once a re-exec has completed (LP: + #901038). + * move udev & local bridges to upstart-bin package. + + -- Dimitri John Ledkov Sat, 17 Jan 2015 01:59:42 +0000 + +upstart (1.13.2-0ubuntu5) vivid; urgency=medium + + * debian/xsession.d/99upstart: Add support for GNOME Flashback + session scripts. + + -- Dmitry Shachnev Sat, 29 Nov 2014 14:39:07 +0300 + +upstart (1.13.2-0ubuntu4) vivid; urgency=medium + + * Fix Breaks/Replaces: operator. *brown paperbag* + + -- Martin Pitt Thu, 20 Nov 2014 07:57:50 +0100 + +upstart (1.13.2-0ubuntu3) vivid; urgency=medium + + [ James Hunt ] + * debian/user-conf/logrotate.conf: Handle corrupt status files. + * init/tests/test_conf_preload.sh.in: Use build-generated libtool to + avoid breaking test_conf_preload.sh when the packaged binary moves + between packages. + * init/Makefile.am: Pass top_builddir to test_conf_preload.sh.in. + + [ Dmitry Shachnev ] + * debian/upstart-xsessions: Update for new GNOME Flashback session + names (LP: #1383382). + + [ Martin Pitt ] + * Move apparmor-profile-load to upstart-bin. Otherwise, if you try to + install e. g. avahi-daemon and systemd-sysv in one go under upstart (as in + systemd's autopkgtest), avahi-daemon will fail. + + -- Martin Pitt Wed, 19 Nov 2014 14:48:48 +0100 + +upstart (1.13.2-0ubuntu2) utopic; urgency=medium + + * debian/upstart-bin.upstart.cron.daily: Redirect stdout to /dev/null as + well, to avoid a daily cron mail with the upstart version. + + -- Martin Pitt Tue, 30 Sep 2014 07:11:16 +0200 + +upstart (1.13.2-0ubuntu1) utopic; urgency=medium + + * New upstream release. + + -- James Hunt Thu, 04 Sep 2014 12:32:07 +0100 + +upstart (1.13.1-0ubuntu4) utopic; urgency=medium + + * debian/upstart-bin.upstart.cron.daily: Only run if upstart is actually + active. + + -- Martin Pitt Thu, 28 Aug 2014 06:24:03 +0200 + +upstart (1.13.1-0ubuntu3) utopic; urgency=medium + + * Split upstart package into upstart & upstart-bin. (LP: #1351306) + + -- Dimitri John Ledkov Wed, 06 Aug 2014 13:07:24 +0100 + +upstart (1.13.1-0ubuntu2) utopic; urgency=medium + + * Cherry-pick cgmanager text fix from upstream. + + -- James Hunt Mon, 28 Jul 2014 11:22:39 +0100 + +upstart (1.13.1-0ubuntu1) utopic; urgency=medium + + * New upstream release. + + -- James Hunt Thu, 17 Jul 2014 15:23:18 +0100 + +upstart (1.13-0ubuntu1) utopic; urgency=medium + + * New upstream release. + * Cherry-pick arm64 test_job_process unit test fix. + + -- Dimitri John Ledkov Mon, 14 Jul 2014 13:57:32 +0100 + +upstart (1.12.1-0ubuntu11) utopic; urgency=medium + + * Do not fail xsession-init pre-start, if SESSIONTYPE is unset, or + setting deprecated gnome-session variable fails for any reason. + + -- Dimitri John Ledkov Fri, 20 Jun 2014 19:07:03 +0100 + +upstart (1.12.1-0ubuntu10) utopic; urgency=medium + + * Revert spurious +x -> -x change on daily upstart cron file. + * Cherrypick reboot command fix to not process REBOOTCOMMAND argument + when in runlevels 2-5 and without using force flag. (LP: #1174272) + + -- Dimitri John Ledkov Fri, 20 Jun 2014 12:09:51 +0100 + +upstart (1.12.1-0ubuntu9) utopic; urgency=medium + + [ Dimitri John Ledkov ] + * Add libcgmanager-dev build-dependency. + + [ Iain Lane ] + * xsession-init: Set $GNOME_DESKTOP_SESSION_ID if we are launching a + gnome-session session. Some applications (Qt4) require this to be set to + any value to detect the environment in use. It was historically set by + gnome-session but now this is no longer the root of the session so not all + user processes are guaranteed to have it. (LP: #1305294) + + -- Dimitri John Ledkov Fri, 20 Jun 2014 11:13:27 +0100 + +upstart (1.12.1-0ubuntu8) utopic; urgency=medium + + * Drop the 01-upstart-lsb hook as it's now part of lsb. + + -- Stéphane Graber Tue, 27 May 2014 16:15:03 +0200 + +upstart (1.12.1-0ubuntu7) utopic; urgency=medium + + * debian/upstart-xsessions: Run unity8-x11 and unity8-mir sessions in a user + session. + + -- Iain Lane Fri, 16 May 2014 18:13:14 +0100 + +upstart (1.12.1-0ubuntu6) utopic; urgency=medium + + * Map force-reload to restart command in init-functions hook. + * Use variable expansion, instead of basename as that is shipped in + /usr. + * Resolve test-failure, when dbus user session job is launched + accidentally by unit-tests. (LP: #1315767) + + -- Dimitri John Ledkov Wed, 07 May 2014 20:15:35 +0100 + +upstart (1.12.1-0ubuntu5) utopic; urgency=medium + + [ James Hunt ] + * debian/manpages/upstart-events.7: Correction for 'rotate-logs'. + * debian/upstart.cron.daily: Specify full path to initctl. + * init/man/init.8: Add missing information on '--chroot-sessions'. + * debian/upstart.apport: Sort system and session jobs. + + [ Dimitri John Ledkov ] + * Add lsb initfunctions hook, to transparently execute the upstart job + instead of the init.d script, when both are provided. For example this + means that e.g. mysql, ssh and other daemons can be operated by + invoking init.d script directly in addition to using invoke-rc.d, + update-rc.d, service and initctl commands. (Closes: #712763) (LP: + #1273462) + + -- Dimitri John Ledkov Sat, 03 May 2014 04:41:23 +0100 + +upstart (1.12.1-0ubuntu4) trusty; urgency=medium + + [ Adam Conrad ] + * Disable chroot sessions by default, add an option to enable chroot + sessions. (LP: #1277594) + + -- Dimitri John Ledkov Fri, 11 Apr 2014 22:31:21 +0100 + +upstart (1.12.1-0ubuntu3) trusty; urgency=medium + + [ Steve Langasek ] + * Rotate user logs daily, not hourly; while we do need them rotated more + often than once per login in the case of long-lived sessions, once per + hour is far too frequent and will cause log data to be rotated off far + too quickly. + + [ Dimitri John Ledkov ] + * Clean-up stale child processes in the new initctl reload test case, + thus resolving hanging buildds. + + -- Dimitri John Ledkov Fri, 11 Apr 2014 20:18:50 +0100 + +upstart (1.12.1-0ubuntu2) trusty; urgency=medium + + [ Steve Langasek ] + * debian/conf/wait-for-state.conf: suppress stderr from 'grep -q + /etc/init/foo.override', since the file may not exist. LP: #1298938. + + [ James Hunt ] (LP: #1306361) + * debian/upstart.cron.hourly: hourly cron job to emit the 'rotate-logs' + event. + * debian/user-conf/logrotate.conf: Run 1 minute after session startup + and whenever the 'rotate-logs' event is emitted. + * debian/manpages/upstart-events.7: Add 'rotate-logs' event. + + [ Dimitri John Ledkov ] + * Reintroduce previous way of reloading jobs, such that "initctl reload" + is now backwards compatible with precise upstart (still) running as + pid 1 during upgrades. (LP: #1303891) + * Add a shebang to debian/upstart.cron.hourly + + -- Dimitri John Ledkov Fri, 11 Apr 2014 05:43:53 +0100 + +upstart (1.12.1-0ubuntu1) trusty; urgency=medium + + [ Dimitri John Ledkov ] + * Adjust wait-for-state job to also check .override for "manual" flag. + + [ James Hunt ] + * New upstream release. + + -- James Hunt Tue, 11 Mar 2014 16:11:37 +0000 + +upstart (1.11-0ubuntu5) trusty; urgency=medium + + * Do not require a specific python3 version. + + -- Matthias Klose Thu, 20 Feb 2014 11:54:22 +0100 + +upstart (1.11-0ubuntu4) trusty; urgency=medium + + * No-change rebuild for Python 3.4. + + -- Matthias Klose Wed, 19 Feb 2014 20:31:46 +0100 + +upstart (1.11-0ubuntu3) trusty; urgency=medium + + * If present, wait for plymouth to come up in shut-down mode before + changing runlevel at shutdown. (LP: #967229) + + -- Dimitri John Ledkov Tue, 04 Feb 2014 15:01:47 +0000 + +upstart (1.11-0ubuntu2) trusty; urgency=low + + [ Steve Langasek ] + * Merge Debian packaging changes from 1.10-2. + + [ James Hunt ] + * debian/manpages/upstart-events.7: Remove Job States and Job Lifecycle + sections since they have been added to init.8 upstream (closes: bug#732125). + * debian/manpages/upstart-events.7: + - Added missing dbus and dconf events. + - Added all inline events to SEE ALSO section for quick reference. + (when coupled with latest upstream doc changes, closes: bug#732128). + * debian/control: add Build-Depends on libtool for test_conf_preload.sh. + * Cherry-pick fix for handling re-exec if job is invalid (LP: #1269731). + + -- James Hunt Tue, 21 Jan 2014 11:50:09 +0000 + +upstart (1.10-2) unstable; urgency=low + + * init/tests/test_state.c: fix test case to not assume SIGUSR1 == 10; + the numeric value may vary between platforms, what we actually care + about is making sure that the deserialization output matches what was in + the json - so check the numeric value, NOT the symbolic signal name. + LP: #1254326. + * init/tests/test_log.c: don't assume the root filesystem is not writable. + If we want to make sure log data stays in the buffer instead of being + flushed to disk, create a log file that we control and know can't be + written to. + + -- Steve Langasek Sat, 23 Nov 2013 22:17:35 +0000 + +upstart (1.10-1) unstable; urgency=low + + * New upstream release. + - fixes racy test utmp test case. Closes: #722572. + - drop changes to init/job_class.[ch] process priority handling in favor + of upstream version. + * Pull in Ubuntu packaging changes: + - add INIT_VERBOSE to rc*.conf, overlooked in the previous merge. + - call dh-autoreconf, adding build-depends on dh-autoreconf and autopoint. + - update debian/copyright. + - add upstart-monitor package. + - migrate to python3. + - use "serial-tests" harness during build, instead of automake1.13's + default "parallel-tests" harness; and build-depend on automake + (>= 1.12) for this interface. + - Enable parallel build. + - Enable initial autopkgtests, just doing a package build and rerunning + the test suite. + - Add upstart-dconf-bridge package. + - Silence running-in-container when called from apparmor-profile-load. + - Hard-code a dependency on libjson0 (>= 0.10-1.2), the first version of + the package that installs to /lib instead of /usr/lib. + - Add postinst to handle stateful reexec on upgrade, and depend on + debianutils for ischroot(1). + - Add libupstart1 and libupstart1-dev packages. + - debian/manpages/upstart-events.7: Update for Session Init events. + - use verbose build (disable silent rules) by default. + - disable upstream build-time abi check. + - don't install upstart-event-bridge or upstart-dconf bridge jobs. + - install an apport hook. + - debian/source/options: Ignore gmo files we rebuild anyway. + - include changes to debian/upstart-job, which in practice should never + be used in Debian. + - init/apparmor.c: do not load apparmor if running in a container or a + live cd. + - init/job_process.c: don't fail if the security profile failed to load. + - drop no longer used util/tests/test_user_sessions.sh. + * For now, do not pull in packaging changes to include upstart user + sessions. + * Reorder the postinst to avoid calling initctl from a chroot on upgrade, + as this has side-effects of triggering upstart chroot sessions. + * Lose the unnecessary postinst boilerplate. + * init/tests/test_job_process.c: adjust test case to not key on the text + of error messages which will vary depending on whether /bin/sh is + dash or bash; and use TEST_STR_MATCH so that in the event of future + failures, we know why it's failing. + * Drop the hard-coded dep on sysv-rc; we already depend on initscripts + which depends on sysv-rc | file-rc, and file-rc now has upstart support, + so we don't need to force users to choose between upstart and file-rc. + Closes: #709483. + + -- Steve Langasek Thu, 21 Nov 2013 21:43:26 +0000 + +upstart (1.11-0ubuntu1) trusty; urgency=low + + [ Dmitrijs Ledkovs ] + * Run as much test-suites as possible, before exiting with failure. + + [ James Hunt ] + * New upstream release. + - the global environment is now serialized on re-exec. LP: #1238078. + - fixes support for upstart-file-bridge detecting directory creation. + LP: #1221466. + - Fixes upstart user session to not override the user's configured + umask. LP: #1240686. + - Makes the session init available on the session dbus. + LP: #1203595, #1235649. + + [ Steve Langasek ] + * Document the authoritative Vcs branch in debian/control. + * Update Standards-Version to 3.9.5, no changes required. + + -- James Hunt Fri, 15 Nov 2013 13:16:56 +0000 + +upstart (1.10-0ubuntu9) trusty; urgency=low + + [ Dmitrijs Ledkovs ] + * If check target fails, cat test-suite log files to standard output + such that they are saved as part of build-log. + + [ Jonathan Davies ] + * debian/rules: Set --enable-selinux in configure flags. + * debian/control: Set build-dependency on libselinux1-dev. + + -- Steve Langasek Wed, 06 Nov 2013 22:15:18 -0800 + +upstart (1.10-0ubuntu8) trusty; urgency=low + + * debian/upstart.apport: + - Handle 'RecoverableProblem' and 'Hang' problem types (LP: #1238058). + - Cleanup now that lp bug 1154536 is fixed. + + [ Steve Langasek ] + * Build-Depend on python3:any for cross-build support. + + [ Dmitrijs Ledkovs ] + * Remove uevent blacklist now that udevd was fixed not to spam on + maguro. + + [ Steve Langasek ] + * extra/upstart-socket-bridge.c: Cherry-pick fix from upstream for + upstart-socket-bridge to also not clobber PATH, using SOCKET_PATH + instead. LP: #1235480. + + -- Steve Langasek Wed, 23 Oct 2013 23:59:20 -0700 + +upstart (1.10-0ubuntu7) saucy; urgency=low + + * Ignore emitting specific udev event spam on maguro, as a workaround + for LP: #1235649. + + -- Dmitrijs Ledkovs Wed, 09 Oct 2013 13:52:10 +0100 + +upstart (1.10-0ubuntu6) saucy; urgency=low + + * extra/upstart-local-bridge.c: use SOCKET_PATH in our event + environment, instead of clobbering PATH. (LP: #1235480) + + -- Steve Langasek Fri, 04 Oct 2013 14:45:40 -0700 + +upstart (1.10-0ubuntu5) saucy; urgency=low + + * extra/conf/upstart-file-bridge.conf: fix the start condition to + comply with the intent, that we start the file bridge only once + the filesystem is up. (LP: #1235387) + + -- Steve Langasek Fri, 04 Oct 2013 11:35:18 -0700 + +upstart (1.10-0ubuntu4) saucy; urgency=low + + [ James Hunt ] + * upstart-local-bridge: allow input to be set of pairs (LP: #1234898) + + [ Dmitrijs Ledkovs ] + * upstart-file-bridge: start session bridge on started dbus. (LP: + #1234841) + + -- Dmitrijs Ledkovs Fri, 04 Oct 2013 15:25:21 +0100 + +upstart (1.10-0ubuntu3) saucy; urgency=low + + * Cherry-pick upstream fix for test failure (LP: #1089159). + + -- James Hunt Thu, 03 Oct 2013 13:25:23 +0100 + +upstart (1.10-0ubuntu2) saucy; urgency=low + + [ James Hunt ] + * debian/upstart.apport: Check session state file set before attempting + to add an apport tag. + * debian/user-conf/logrotate.conf: Move sleep from pre-start to main stanza + to ensure session shutdown is fast even in the case where it is triggered + soon after login. + * Optimise and speed-up session logout (LP: #1227212) + + [ Steve Langasek ] + * Use ${libdir} instead of including /usr/share/dpkg/architecture.mk. + * Drop manual symlinking of manpages, the upstream rules do this fine + for us already. + + -- James Hunt Tue, 01 Oct 2013 14:10:25 +0100 + +upstart (1.10-0ubuntu1) saucy; urgency=low + + * New upstream release (LP: #1199778, #1200264, #1201865). + * debian/user-conf/{re-exec,upstart-file-bridge}.conf: Removed as now + supplied by upstream. + * debian/upstart.install: Use all upstream-provided session config files. + * debian/control: Add upstart-dconf-bridge package. + * debian/rules: Remove files from upstart package that now live in the + upstart-dconf-bridge package. + * debian/upstart-dconf-bridge.install: New. + * debian/upstart-dconf-bridge.manpages: New. + + -- James Hunt Mon, 09 Sep 2013 10:22:18 +0100 + +upstart (1.9.1-0ubuntu5) saucy; urgency=low + + * Turn on Upstart user sessions for all the Ubuntu flavours. + + -- Stéphane Graber Tue, 27 Aug 2013 10:25:22 -0400 + +upstart (1.9.1-0ubuntu4) saucy; urgency=low + + [ Dmitrijs Ledkovs ] + * Bump upstart-dbus-bridge conf file removal to 1.9.1-0ubuntu4. (LP: #1203323) + + [ James Hunt ] + * debian/upstart.apport: Check to ensure that the sessions array contains + atleast one element. + + -- Dmitrijs Ledkovs Fri, 23 Aug 2013 11:43:40 +0100 + +upstart (1.9.1-0ubuntu3) saucy; urgency=low + + * Fix stateful re-exec with multiple stale chroot sessions (LP: #1199778) + + -- Dmitrijs Ledkovs Sat, 20 Jul 2013 00:17:07 +0100 + +upstart (1.9.1-0ubuntu2) saucy; urgency=low + + [ Dmitrijs Ledkovs ] + * Upload to saucy. + + [ James Hunt ] + * Fix stateful re-exec with active chroot sessions (LP: #1199778) + + [ Colin Watson ] + * Alternatively try new and old pkg-config names for json-c library. + + -- Dmitrijs Ledkovs Thu, 18 Jul 2013 10:56:31 +0100 + +upstart (1.9.1-0ubuntu1) saucy; urgency=low + + [ James Hunt ] + * debian/upstart.apport: + - Added session count to report ('UpstartRunningSessionCount'). + - Join Upstart session to ensure 'UpstartRunningSessionJobs' shows + session jobs and doesn't default to showing system ones. + * debian/copyright: Update year. + * New upstream release. + * debian/{control,libupstart*}: Add libupstart packaging. + * debian/rules: + - Delete upstart-dbus-bridge.conf to avoid running it at the system level. + - Install libupstart.pc to correct multi-arch location. + * debian/upstart.postinst: Handle safe removal of + upstart-dbus-bridge.conf (which is not used at the system level). + * debian/control: Add build-depends on automake >= 1.12 for serial-tests + in configure.ac (LP: #1197529). + * debian/libupstart-dev.install: Specify wildcarded path (for multi-arch). + + [ Dmitrijs Ledkovs ] + * Correct libupstart1.symbols, whilst soname is at 1.0.0, all of them + first appeared in 1.9.1 upstream version. + * Use dpkg-maintscript-helper to remove obsolete conffiles. + + -- James Hunt Mon, 08 Jul 2013 14:04:28 +0100 + +upstart (1.9-0ubuntu2) saucy; urgency=low + + * Cherry-pick upstream fix for crashing bridges (LP: #1197225) + + -- Dmitrijs Ledkovs Wed, 03 Jul 2013 09:37:35 +0100 + +upstart (1.9-0ubuntu1) saucy; urgency=low + + [ Dmitrijs Ledkovs ] + * Use dh_auto_build to run the testsuite, as dh_auto_test stopped + finding autotools test suite. + * Correct typo in upstart postinst (LP: #1195955) + + [ James Hunt ] + * New upstream release. + * init/tests/test_conf.c: Remove duplicate define. + + [ Stéphane Graber ] + * Cherry-pick r1498 from upstream upstart to fix incorrect respawn handling + for jobs that have shell characters in their expanded command line. + (LP: 1181789) + + [ Marc Deslauriers ] + * Added some distro-specific changes: + - init/apparmor.c: do not load apparmor if running in a container or a + live cd. + - init/job_process.c: don't fail if the security profile failed to load + to emulate current behaviour on Ubuntu. + + -- Dmitrijs Ledkovs Tue, 02 Jul 2013 20:14:51 +0100 + +upstart (1.8-0ubuntu7) saucy; urgency=low + + * Simplify postinst re-exec logic by removing runlevel checks. Now the + logic is: + - re-exec if lossless stateful re-exec is available + - perform partial stateful re-exec, unless running under upstart + - re-exec if upgrading from pre dbus capable upstart + - do nothing if running from chroot + - otherwise hint that init is upgraded + + -- Dmitrijs Ledkovs Mon, 17 Jun 2013 14:17:58 +0100 + +upstart (1.8-0ubuntu6) saucy; urgency=low + + * debian/upstart.postinst: + - When only partial stateful re-exec is available, and upgrade is run by + cloud-config simply leave init upgraded. + - When partial stateful re-exec is not performed also leave reboot required marker. + + -- Dmitrijs Ledkovs Thu, 13 Jun 2013 14:36:17 +0100 + +upstart (1.8-0ubuntu5) saucy; urgency=low + + * Change upstart's version string, such that postinst can detect whether + the running upstart instance has full serialization fixes. + * In postinst, check running upstart for the above version number or 1.9 + or better and then perform lossless stateful re-execution. Other wise + check for runlevels 2-5 and perform partial stateful re-execution. + + -- Dmitrijs Ledkovs Tue, 11 Jun 2013 10:51:53 +0100 + +upstart (1.8-0ubuntu4) saucy; urgency=low + + [ James Hunt ] + * Cherry pick lp:~jamesodhunt/upstart/serialise-remaining-objects (LP:#1124384): + - Preserve event blockers during configuration reload. + - Serialise & deserialise blocking events during stateful + re-execution. + * debian/manpages/upstart-events.7: Added ':sys:restarted'. + * debian/upstart.postinst: Don't re-exec if runlevel is not 2 + yet (to allow cloud-init to dist-upgrade upstart safeily in early boot). + + [ Dmitrijs Ledkovs ] + * Upload to saucy. + * Use "serial-tests" harness during build, instead of the automake's + 1.13 default "parallel-tests" harness. + * Enable parallel build by default. + + -- Dmitrijs Ledkovs Thu, 06 Jun 2013 16:15:09 +0100 + +upstart (1.8-0ubuntu3) saucy; urgency=low + + * Update the Xsession.d scripts to be a bit more generic and work with + lxsession as well as gnome-session. + + -- Stéphane Graber Fri, 31 May 2013 17:13:15 -0400 + +upstart (1.8-0ubuntu2) saucy; urgency=low + + [ James Hunt ] + * debian/manpages/upstart-events.7: Added ':sys:restarted'. + + [ Stéphane Graber ] + * Turn on user sessions by default for the 'ubuntu' xsession. + * Manually add scripts/man/upstart-monitor.8 as it was missing from the + upstream 1.8 tarball. + + -- Stéphane Graber Fri, 03 May 2013 09:55:36 -0700 + +upstart (1.8-0ubuntu1) raring; urgency=low + + [ James Hunt ] + * debian/manpages/upstart-events.7: Update for Session Init events + and file bridge. + * debian/rules: Install apport hook. + * debian/upstart.apport: Addition of apport hook to handle PID 1 and + Session Init bugs. + * debian/upstart.dirs: Remove invalid leading slash and add apport + directory. + * Cherry-pick man page related fixes from upstream. + * debian/control: Create a separate upstart-monitor package and make + upstart suggest it. + * debian/rules: + - Add python3 and associated graphical packages. + - Handle man pages. + * debian/upstart.install: Add in files not now copied by default + now we have a separate upstart-monitor package. Note that initctl2dot + and init-checkconf are now correctly installed to /usr/bin rather + than /bin. + * debian/upstart-monitor.install: New file. + * debian/upstart-monitor.manpages: New file. + * debian/upstart.links: New file. + * debian/user-conf/upstart-file-bridge.conf: Required as start condition + different to system job of same name. + + [ Iain Lane ] + * Set $SESSIONTYPE when emitting the xsession event that specifies the type + of session being launched. Currently only gnome-session is supported. + + -- James Hunt Tue, 26 Mar 2013 17:13:12 +0000 + +upstart (1.7-0ubuntu1b1) raring; urgency=low + + * No-change rebuild against libudev1 + + -- Martin Pitt Wed, 13 Mar 2013 07:02:18 +0000 + +upstart (1.7-0ubuntu1) raring; urgency=low + + [ Stéphane Graber ] + * New upstream release + * Install Xsession hooks and initial set of user jobs. Those will only be + used if the user explicitly whitelist the session in /etc/upstart-xsessions + + [ James Hunt ] + * Remove user_sessions DEP-8 test since User Jobs are no longer + supported and replace with a dummy test that just forces the + tests to run. + + -- Stéphane Graber Thu, 07 Mar 2013 16:16:13 -0500 + +upstart (1.6.1-1ubuntu3) raring; urgency=low + + * Use verbose build (disable silent rules) by default. + * Cherry-pick r1436 to support passing reboot command. + + -- Dmitrijs Ledkovs Mon, 25 Feb 2013 15:42:00 +0000 + +upstart (1.6.1-1ubuntu2) raring; urgency=low + + [ Stéphane Graber ] + * Call autoreconf so we can use the same packaging for snapshots as for + release tarballs. Add depends on dh-autoreconf and autopoint. + + [ James Hunt ] + * init/log.c: Cherry-pick of upstream fix for jobs which end before + the log disk becomes writeable and which spawn off additional + processes which persist after the main job process has ended + (LP: #1096531). + + -- James Hunt Tue, 22 Jan 2013 15:18:30 +0000 + +upstart (1.6.1-1ubuntu1) raring; urgency=low + + [ Steve Langasek ] + * New upstream release. + * Merge with Debian. + - drop debian/conf/dbus-reconnect.conf again, only needed in Debian. + - don't build against libselinux; this is probably fine to have in + Ubuntu, but this isn't the time to add it. + - back down the Debian-specific versioned depends on sysvinit, ifupdown, + udev + * Export $TERM in init/Makefile.am; the Debian buildds don't set this, + which results in test failures because of assumptions that it will be + available. + * Hard-code a dependency on libjson0 (>= 0.10-1.1ubuntu1), the first + version of the package that installs to /lib instead of /usr/lib. + + [ James Hunt ] + * debian/upstart-job: Allow script to operate quietly by reading optional + /etc/default/upstart-job configuration. Thanks to Jouko Orava + (LP: #613231) + * debian/control: Added debianutils for ischroot(1). + * debian/upstart.postinst: Enabled stateful re-exec handling in selected + upgrade scenarios. Details: + - Only query running version if initctl is known to work. + - Discard initctl stderr just in case. + - Do not re-exec if running in a chroot (uses ischroot(1)). + - Removed redundent check on previously installed version. + - Updated lengthy commentary. + + [ Stéphane Graber ] + * debian/apparmor-profile-load: Ignore output from running-in-container. + This prevents the output of running-in-container from being appended to + rsyslog's upstart log (and any other job calling apparmor-profile-load). + + [ Dmitrijs Ledkovs, James Hunt ] + * Add DEP-8 autopkgtests. + + -- Steve Langasek Thu, 15 Nov 2012 09:26:10 -0800 + +upstart (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Declare a Breaks: against old versions of cryptsetup which have upstart + jobs named in a way that will deadlock the boot. (Ref: bug #694499) + * Make versioned build-dep on json-c (>= 0.10) explicit. + * Add debian/conf/dbus-reconnect.conf, to tell upstart to connect to the + system bus once dbus is started. This is a temporary solution until + dbus in Debian has native upstart support. + + -- Steve Langasek Mon, 10 Dec 2012 00:28:29 -0800 + +upstart (1.6-3) unstable; urgency=low + + * init/tests/test_job_process.c: don't test the blocked/ignored signal list + in a spawned job; this is not testing the upstart code but the + characteristics of the system, and the test is wrong because it assumes + the signal lists in /proc/self/status fit in an unsigned long int + - patently untrue on mips, where we have 128 signals for historical + reasons. + + -- Steve Langasek Sun, 18 Nov 2012 12:25:21 -0600 + +upstart (1.6-2) unstable; urgency=low + + * init/tests/test_job_process.c: cherry-pick upstream fix for test which + was accidentally relying on a variable persisting after it's gone out of + scope. + * init/tests/test_job_process.c: drop change to print path in the test, + should be fixed by the above. + * init/job_class.[ch]: instead of assuming a fixed value (0) as the + default nice value for job processes, use whatever the nice value of the + current process is. This will be important later for user sessions + where an entire session may be started with a higher nice value; and it + fixes running the test suite as part of a nice'd build. + * init/tests/test_job_class.c: update test suite to match. + + -- Steve Langasek Sun, 18 Nov 2012 01:54:29 -0600 + +upstart (1.6-1) unstable; urgency=low + + * New upstream release. + * Add build-dependency on libjson0-dev. + * Export $TERM in init/Makefile.am; the Debian buildds don't set this, + which results in test failures because of assumptions that it will be + available. + * init/tests/test_job_process.c: tests are failing to re-exec the test + binary on mips for no clear reason; output the path so we can try to + debug. + * init/tests/test_job_process.c: amd64 build failed with an inscrutible + error from waitid(). Print errno on failure to try to diagnose this. + + -- Steve Langasek Sat, 17 Nov 2012 23:19:37 -0600 + +upstart (1.5-1) unstable; urgency=low + + * New maintainer. + * New upstream release. Closes: #627544. + * Drop /etc/init/dbus-reconnect.conf, no longer needed. + * Add new jobs from Ubuntu: console, container-detect, failsafe, + flush-early-job-log, rcS.conf, shutdown, wait-for-state. + * Use 'linux-any' in the architecture check in debian/control, instead of + trying to enumerate all non-linux archs. Closes: #634513. + * Conflict with lxcguest package (Ubuntu-specific). + * Breaks old friendly-recovery (Ubuntu-specific). + * Mark upstart multi-arch: foreign. + * Add upstart-events(7) manpage from Ubuntu. + * Update packaging to dh(1), debian/compat=9 (from Ubuntu). + * debian/running-in-container: a script using container.conf to + answer whether upstart is running in a container. + * refresh soon-to-be-obsolete upstart-job helper from Ubuntu. + * Add bash-completion support. + * Add /var/log/upstart directory and logrotate support. + * Don't re-exec init on upgrade, we don't currently support stateful + re-exec. + * Switch to source format 1.0 for consistency with Ubuntu and for sane(r) + VCS handling. + * Add versioned dependencies on ifupdown and udev for the prerequisite + boot events. + * util/shutdown.c: look for sysvinit at /run/initctl before /dev/initctl, + so that we're compatible with both the old and new paths used by + sysvinit in Debian. Closes: #659540. + * Move to bzr for the official package Vcs, for greater synergy with the + Ubuntu packaging. + * Use copyright-format/1.0 for debian/copyright. This drops Scott from + the list of copyright holders, as an individual copyright is not + attested in any of the upstream sources. + + -- Steve Langasek Mon, 12 Nov 2012 13:38:34 -0800 + +upstart (1.5-0ubuntu9) quantal-proposed; urgency=low + + * debian/apparmor-profile-load: exit 0 if apparmor_parser fails to not + block upgrades (errors will still be logged by upstart). This can be + removed once apparmor_parser better deals with new policy on old kernels + - LP: #1058356 + + -- Jamie Strandboge Fri, 12 Oct 2012 13:54:10 -0500 + +upstart (1.5-0ubuntu8) quantal; urgency=low + + * Merge of latest upstream including doc fixes, fixes for booting + on initramfs-less systems and improved error handling in spawn + failure scenarios (LP: #980917, #1032101). + + -- James Hunt Wed, 08 Aug 2012 10:05:34 +0100 + +upstart (1.5-0ubuntu7) precise-proposed; urgency=low + + * Correct a build failure from the previous upload. + + -- Steve Langasek Thu, 26 Apr 2012 07:48:17 -0700 + +upstart (1.5-0ubuntu6) precise-proposed; urgency=low + + * debian/upstart.logrotate: don't create empty files after rotation; + upstart will automatically create new log files for jobs as needed. + * init/main.c: restore the fix for bug #540256; we know the console setup + is taken care of by plymouth in Ubuntu, so upstart changing the console + settings just makes trouble (such as turning echo back on when it + shouldn't be). LP: #876626. + + [ James Hunt ] + * debian/upstart-job: Only attempt to handle disabled jobs if the running + version of Upstart supports such a query (LP: #985755, #984474). + * debian/manpages/upstart-events.7: Fixed typo and corrected reference to + 'kill signal' stanza. + + -- Steve Langasek Wed, 25 Apr 2012 13:23:34 -0700 + +upstart (1.5-0ubuntu5) precise; urgency=low + + * debian/upstart-job: Add in handling for disabled jobs: + - Do not restart a job if disabled, unless job was forcibly started. + - Do stop a disabled job that was forcibly started. + Resolves issue where 'invoke-rc.d restart' erroneously started disabled + jobs on package upgrade (LP: #974147) + + -- James Hunt Tue, 10 Apr 2012 09:19:03 +0100 + +upstart (1.5-0ubuntu4) precise; urgency=low + + * debian/apparmor-profile-load: don't run in a container. This can + hopefully be removed after stacked profiles are supported and + used by lxc. (LP: #978297) + + -- Serge Hallyn Tue, 10 Apr 2012 14:55:41 -0500 + +upstart (1.5-0ubuntu3) precise; urgency=low + + * debian/manpages/upstart-events.7: Correct emitter for + "static-network-up" event. + + -- James Hunt Wed, 28 Mar 2012 11:59:56 +0100 + +upstart (1.5-0ubuntu2) precise; urgency=low + + * debian/conf/flush-early-job-log.conf: Change initctl command from + 'flush-early-job-log' to 'notify-disk-writeable' to reflect new name. + * init/man/init.8: Remove duplicate telinit(8). + * debian/manpages/upstart-events.7: + - Added table 'Job Goals and State Transitions'. + - Corrected errors and omissions in 'Job Lifecycle' section. + + -- James Hunt Wed, 28 Mar 2012 11:00:04 +0100 + +upstart (1.5-0ubuntu1) precise; urgency=low + + * FFe. LP: #962124. + * New upstream 1.5 release. + - fix boot failure when /dev/pts is not mounted before upstart starts. + LP: #936667. + - fix a file descriptor leak on job restarts. LP: #940290. + * debian/conf/failsafe.conf: Added missing "emits" which breaks + 'initctl check-config'. + * debian/manpages/upstart-events.7: Added 'failsafe-boot' and + 'recovery' events. + + -- James Hunt Thu, 22 Mar 2012 13:50:31 +0000 + +upstart (1.4-0ubuntu9) precise; urgency=low + + [ Steve Langasek ] + * debian/conf/failsafe.conf: instead of waiting for the 'runlevel' event + before considering failsafe done, stop this job as soon as we're + starting rc-sysinit; that way, any delays in /etc/rcS.d will not cause + confusing messages about networking delays when the network is not the + problem. (LP: #950662) + + [ James Hunt ] + * init/log.c:log_read_watch(): Set remote_closed for scenarios where error + handler never called. (LP: #935585) + + [ Serge Hally ] + * debian/conf/power-status-changed.conf: shut down on getting SIGPWR. + Unprivileged tasks can't send this signal. In particular this will + allow clean shutdown of containers from the host. + (See http://www.makelinux.net/man/7/P/power-status-changed) + + [ Stéphane Graber ] + * Rename Serge's job to shutdown.conf to avoid a name conflict with the + event power-status-changed. + + -- Stéphane Graber Fri, 16 Mar 2012 13:48:04 -0400 + +upstart (1.4-0ubuntu8) precise; urgency=low + + * init/tests/test_job_process.c: + - close_all_files(): Correct type of index variable. + - test_run(): + - "with single line command writing lots of data fast and exiting": + - add waitid() call to ensure log is not added to unflushed list. + - "with log object freed on process exit": + - add waitid() call to ensure log is not added to unflushed list. + * util/tests/test_initctl.c: test_flush_early_job_log(): + - "with job ending before log disk writeable": Give Upstart a chance + to run the job as sometimes we see the job pid in the output which + causes the test to fail. + + -- James Hunt Fri, 17 Feb 2012 10:58:02 -0500 + +upstart (1.4-0ubuntu7) precise; urgency=low + + * debian/manpages/upstart-events.7: Added missing events 'container' and + 'not-container'. + * Update 'runlevel' event emission time in upstart-events(7) (LP: #921501). + * Merge of important upstream log fixes to avoid spinning when a job + which leaks fds (such as 'sshd -D') is stopped (LP: #926468). + * Merge of lp:~jamesodhunt/upstart/early-job-log-flush to allow jobs that + _end_ very early in the boot to have their output logged. + * debian/conf/flush-early-job-log.conf: Upstart job to force flushing of + early job log output data when disk becomes writeable. + * Re-enable job logging by default. + + [ Steve Langasek ] + * init/tests/test_job_process.c: close all fds before running tests that + check for unexpected open fds, so that files leaked from the environment + don't cause the test suite to fail gratuitously. LP: #926473. + * bump debhelper compat to 9 and adjust debian/rules to use the + dpkg-buildflags interfaces, so that upstart can be cross-compiled and + also so we pick up any future hardening flags for free. + + -- Steve Langasek Thu, 16 Feb 2012 07:52:11 +0000 + +upstart (1.4-0ubuntu6) precise; urgency=low + + [ Serge Hallyn ] + * debian/conf/container-detect.conf: an upstart job to track whether upstart + detected itself running in a container. + * debian/running-in-container: a script using container.conf to + answer whether upstart is running in a container. + * debian/conf/console.conf: run getty on /dev/console when running + in a lxc container. + * debian/control: conflict with lxcguest. + + [ Stéphane Graber ] + * debian/conf/container-detect.conf: extend to also detect OpenVZ and vserver + as well as write the type in /run/container_type and emit either: + - container CONTAINER=type + (where type is lxc, lxc-libvirt, openvz or vserver) + - not-container + * debian/running-in-container: extend to also print the type of container. + * Rebase debian/conf/console.conf on debian/conf/tty1.conf. + * Update tty[1234].conf to start on regular machines and LXC containers. + * Update tty[56].conf to only start on regular machines. + + -- Stéphane Graber Wed, 08 Feb 2012 16:44:59 -0500 + +upstart (1.4-0ubuntu5) precise; urgency=low + + * Merge of important upstream log fixes to handle scenario attempts + are made to exec(3) directly non-existent commands. (LP: #922754) + + -- James Hunt Fri, 03 Feb 2012 14:16:40 +0000 + +upstart (1.4-0ubuntu4) precise; urgency=low + + * Disable job logging by default again due to a reported regression with + plymouth-upstart-bridge and upstart itself taking 100% CPU. Use --log + at boot time again for testing. + + -- Steve Langasek Fri, 27 Jan 2012 11:04:05 -0800 + +upstart (1.4-0ubuntu3) precise; urgency=low + + [ Stéphane Graber ] + * Mark upstart Multi-Arch:foreign + + [ James Hunt ] + * Merge of important logger fixes from upstream lp:upstart + (LP: #912558). + * Reverted temporary fix to disable job logging. + + -- James Hunt Thu, 26 Jan 2012 15:13:25 +0000 + +upstart (1.4-0ubuntu2) precise; urgency=low + + * init/main.c: Temporarily disable default job logging whilst + investigating bug 912558 (can be re-enabled with + _temporary_ '--log' option). + + -- James Hunt Fri, 06 Jan 2012 16:11:23 +0000 + +upstart (1.4-0ubuntu1) precise; urgency=low + + * New upstream 1.4 release. + * debian/upstart.dirs: Create /var/log/upstart to hold job logs. + * debian/upstart.logrotate: Logrotate script for job logs. + * po/en@boldquot.gmo, po/en@quot.gmo: Overwrite with upstream versions to + keep bzr happy. This makes the files technically "wrong" (since the + Ubuntu Upstart code has additional messages not in upstream), but they get + re-genrated on build so it all works out. + * debian/manpages/upstart-events.7: Add missing 'static-network-up' + event (LP: #889047). + * debian/manpages/upstart-events.7: Add missing + 'deconfiguring-networking' event (LP: #904175). + * Upstream merge for minor test fixes. + * Upstream merge for review fixes. + * Merge of upstream fix for running tests in environment not + supporting full POSIX SIGCHLD semantics. + + -- James Hunt Thu, 22 Dec 2011 16:51:43 +0000 + +upstart (1.3-0ubuntu11) oneiric-proposed; urgency=low + + * debian/conf/failsafe.conf: stop on static-network-up, so that a slow + runlevel switch doesn't leave a confusing message on screen about + starting up without networking. LP: #881079. + + -- Steve Langasek Wed, 26 Oct 2011 12:05:47 -0700 + +upstart (1.3-0ubuntu10) oneiric; urgency=low + + [ Clint Byrum ] + * debian/conf/failsafe.conf: do delay as script, not pre-start, so + that the messages/delays are stopped on runlevel immediately. emit + as an event, failsafe-boot, to provide finer grained control. + (LP: #863864) + * conf/rc-sysinit.conf: change from 'started failsafe' to 'failsafe-boot' + to accomodate changes to failsafe.conf. + + [ Steve Langasek ] + * Document device-not-ready in upstart-events(7). LP: #805510. + * Document desktop-shutdown in upstart-events(7). LP: #854329. + * Mention lightdm in the list of example DMs in upstart-events(7), since + it's now the default... + + -- Steve Langasek Mon, 03 Oct 2011 18:37:04 -0700 + +upstart (1.3-0ubuntu9) oneiric; urgency=low + + * Update rcS.conf to only start single user mode but not friendly-recovery. + (LP: #575469) + * Mark upstart as breaking friendly-recovery << 0.2.13 + + -- Stéphane Graber Thu, 15 Sep 2011 16:04:17 -0400 + +upstart (1.3-0ubuntu8) oneiric; urgency=low + + * debian/conf/failsafe.conf: Add plymouth messages to help users + understand why the system boot takes longer when they have + static network interfaces defined. (LP: #847782) + + -- Clint Byrum Wed, 14 Sep 2011 18:53:10 -0700 + +upstart (1.3-0ubuntu7) oneiric; urgency=low + + * debian/conf/failsafe.conf: raise timeout to 120 seconds to + allow for very slow DHCP interfaces to come up on servers. + (LP: #839595) + + -- Clint Byrum Sun, 04 Sep 2011 09:29:27 -0700 + +upstart (1.3-0ubuntu6) oneiric; urgency=low + + [ Steve Langasek ] + * Fix maintainer field to be compliant with policy definition + + [ Clint Byrum ] + * conf/rc.conf: document events that are emitted by sysvinit + jobs to quiet 'initctl check-config' + * extra/conf/upstart-udev-bridge.conf: narrow definition to + only the events actually emitted. (LP: #819928) + * debian/conf/failsafe.conf: new job for critical services to + start on. + * conf/rc-sysinit.conf: start after static-network-up or failsafe + so that runlevel 2 is only entered with all static net interfaces + up. (LP: #580319) + + -- Clint Byrum Wed, 10 Aug 2011 08:44:43 -0500 + +upstart (1.3-0ubuntu5) oneiric; urgency=low + + * Upstream cherry-pick for user session fixes + ("bzr merge -r 1318..1324 lp:upstart"). + + -- James Hunt Mon, 25 Jul 2011 17:09:47 +0100 + +upstart (1.3-0ubuntu4) oneiric; urgency=low + + * init/main.c: main(): Add support for "/run" directory with fallback to + old location for initramfs state passing (LP: #810956). + * Upstream cherry-pick to get dbus fix ("bzr merge -r 1314.. lp:upstart"). + + -- James Hunt Wed, 20 Jul 2011 14:51:04 +0100 + +upstart (1.3-0ubuntu3) oneiric; urgency=low + + * init/paths.h: Syned with upstream since Ubuntu file appears to have + diff applied twice, causing redefines. + + -- James Hunt Fri, 17 Jun 2011 09:59:49 +0100 + +upstart (1.3-0ubuntu2) oneiric; urgency=low + + * init/Makefile.am: Sync up from upstream, dropping TEST define which is + no longer required now we set UPSTART_NO_SESSIONS for init/tests/*.c + and specify "--no-sessions" for util/tests/*.c. + + -- James Hunt Fri, 17 Jun 2011 09:47:36 +0100 + +upstart (1.3-0ubuntu1) oneiric; urgency=low + + * Merge of Upstart 1.3 (lp:upstart @ 1.3 release tag). + + -- James Hunt Thu, 16 Jun 2011 15:09:41 +0100 + +upstart (0.9.7-3) oneiric; urgency=low + + * Merge of upstream lp:~upstart-devel/upstart/0.9: Updates for + init-checkconf. + + -- James Hunt Wed, 27 Apr 2011 15:19:47 +0100 + +upstart (0.9.7-2) oneiric; urgency=low + + * Add wait-for-state generic "wait job". + + -- Clint Byrum Wed, 04 May 2011 08:32:04 -0700 + +upstart (0.9.7-1) natty; urgency=low + + * New upstream release 0.9.7: Important session fix (LP: #767053). + + -- James Hunt Wed, 20 Apr 2011 17:44:41 +0100 + +upstart (0.9.6-1ubuntu1) natty; urgency=low + + [ James Hunt ] + * init/man/init.5: Remove mention of user jobs since facility is + disabled. + + [ Clint Byrum ] + * Noting bugs fixed by 0.9.6 release of upstart: (LP: #728531 , LP: #766206) + + -- Clint Byrum Tue, 19 Apr 2011 13:16:46 -0700 + +upstart (0.9.6-1) natty; urgency=low + + * New upstream release 0.9.6: Important session+chroot fixes. + + -- James Hunt Fri, 15 Apr 2011 15:36:40 +0100 + +upstart (0.9.5-1ubuntu1) natty; urgency=low + + [ Clint Byrum ] + * debian/upstart-job: change behavior to reload job configuration on + restart, which more closely matches expected sysvinit script + behavior. (LP: #707479) + + -- James Hunt Wed, 06 Apr 2011 17:50:53 +0100 + +upstart (0.9.5-1) natty; urgency=low + + * New upstream release 0.9.5. + + -- James Hunt Wed, 06 Apr 2011 17:45:38 +0100 + +upstart (0.9.4-1ubuntu1) natty; urgency=low + + * debian/manpages/upstart-events.7: + - Corrected reference to Upstart man page (actually init). + - Changed to using proper troff quotes. + - Escaped dashes in event names. + - Updated date. + - Table 1: + - Improved name. + - Sorted columns: Events, References, and Notes. + - Added unmounted-remote-filesystems event. + + -- James Hunt Thu, 24 Mar 2011 14:34:12 +0000 + +upstart (0.9.4-1) natty; urgency=low + + * New upstream release 0.9.4: + - scripts/initctl2dot.py: Fixes to handle 'emits' glob syntax. + + -- James Hunt Thu, 24 Mar 2011 14:31:26 +0000 + +upstart (0.9.3-1) natty; urgency=low + + * New upstream release 0.9.3: + - Added missing emits stanzas for supplied .conf files. + - Added wildcard/globbing facility to initctl.c (for check-config + command). + - Updated man page on emits stanza syntax. + + -- James Hunt Tue, 15 Mar 2011 11:57:11 +0000 + +upstart (0.9.2-1) natty; urgency=low + + * Merge of upstream lp:~upstart-devel/upstart/0.9. + + -- James Hunt Fri, 11 Mar 2011 10:34:39 +0000 + +upstart (0.9.1-1ubuntu5) natty; urgency=low + + * Merge of upstream lp:~upstart-devel/upstart/0.9. + + -- James Hunt Thu, 10 Mar 2011 14:23:28 +0000 + +upstart (0.9.1-1ubuntu4) natty; urgency=low + + * Merge of upstream lp:~upstart-devel/upstart/0.9. + + -- James Hunt Mon, 07 Mar 2011 15:08:35 +0000 + +upstart (0.9.1-1ubuntu3) natty; urgency=low + + * debian/upstart.bash-completion: Fixed path so dh_bash-completion + considers it a file, not a snippet. + + -- James Hunt Fri, 04 Mar 2011 21:26:27 +0000 + +upstart (0.9.1-1ubuntu2) natty; urgency=low + + * debian/control: Added Suggests for python, graphviz and + bash-completion. + * debian/rules: Invoke bash-completion add-on explicitly. + * debian/manpages/upstart-events.7: New man page. + * debian/upstart.bash-completion: Install bash completion. + * debian/upstart.manpages: Install upstart-events.7. + + -- James Hunt Fri, 04 Mar 2011 17:16:26 +0000 + +upstart (0.9.1-1ubuntu1) natty; urgency=low + + * Merge of upstream lp:~upstart-devel/upstart/0.9. + + -- James Hunt Fri, 04 Mar 2011 15:13:35 +0000 + +upstart (0.9.1-1) natty; urgency=low + + * Merge of upstream lp:~upstart-devel/upstart/0.9. + + -- James Hunt Thu, 03 Mar 2011 20:52:16 +0000 + +upstart (0.9.0-1ubuntu3) natty; urgency=low + + * Revert dbus/Upstart.conf to the version in 0.6.7, disabling user session + support until such time as it has comprehensive test suite coverage. + + -- Colin Watson Mon, 28 Feb 2011 20:29:01 +0000 + +upstart (0.9.0-1ubuntu2) natty; urgency=low + + * Added extra/Makefile.in to avoid build failing. These files need removing + at a later date and debian/rules updating to call dh-autoreconf. + + -- James Hunt Thu, 24 Feb 2011 16:39:28 +0000 + +upstart (0.9.0-1ubuntu1) natty; urgency=low + + * debian/control: Updated for nih version 1.0.3 (required for nih-dbus-tool + and DBUS_TYPE_UNIX_FD). + * removed binary message catalog files causing build issues: + - po/en@boldquot.gmo + - po/en@quot.gmo + + -- James Hunt Thu, 24 Feb 2011 16:06:13 +0000 + +upstart (0.9.0-1) natty; urgency=low + + * New upstream release: + - Session support (chroots, sessions and user-session). + - Socket bridge. + - Override file support. + + -- James Hunt Thu, 24 Feb 2011 14:22:14 +0000 + +upstart (0.6.7-7) natty; urgency=low + + * Re-add upstream r977 to allow proper re-exec on shutdown (LP: #672177) + * debian/control: adding Breaks on eglibc version that disables + telinit u to avoid accidentally installing a version of libc6 that + will cause upstart to re-exec and lose its state. + + -- Clint Byrum Fri, 21 Jan 2011 08:39:13 -0800 + +upstart (0.6.7-6) natty; urgency=low + + * debian/apparmor-profile-load: check for correct AppArmor profile loading + interface file (LP: #710649). + + -- Kees Cook Thu, 03 Feb 2011 13:45:32 -0800 + +upstart (0.6.7-5) natty; urgency=low + + * debian/upstart-job: properly handle jobs that are in state 'start/running' + with no PID, by checking only if the goal is 'start'. LP: #603934, + #707971. + + -- Steve Langasek Wed, 26 Jan 2011 14:05:43 -0800 + +upstart (0.6.7-4) natty; urgency=low + + * debian/apparmor-profile-load: allow profiles to be missing for saner + packaging integration. + + -- Kees Cook Fri, 14 Jan 2011 13:46:12 -0800 + +upstart (0.6.7-3) natty; urgency=low + + * debian/rules: make sure apparmor-profile-load is executable. + + -- Kees Cook Wed, 22 Dec 2010 10:55:09 -0800 + +upstart (0.6.7-2) natty; urgency=low + + * debian/apparmor-profile-load: common AppArmor profile loading helper + which can be used by any upstart services, regardless of the state + of AppArmor (LP: #692801). + + -- Kees Cook Mon, 20 Dec 2010 16:03:33 -0800 + +upstart (0.6.7-1) natty; urgency=low + + * New upstream release: + - Added manual stanza. + - Added debug stanza. + - Added start_on, stop_on and emits properties. + - Added GoalChanged, StateChanged and Failed signals. + - Documentation updates. + + * Added myself as a maintainer. + + -- James Hunt Tue, 14 Dec 2010 17:15:57 +0000 + +upstart (0.6.6-3) maverick; urgency=low + + * Ubuntu seems to have stopped installing Recommends of Build-Depends, + add a Build-Depend on dbus. LP: #602130. + + -- Scott James Remnant Thu, 12 Aug 2010 16:38:05 -0400 + +upstart (0.6.6-2) maverick; urgency=low + + * Apply patch from trunk to use /dev/null when /dev/console is unavailable + due to kernel bugs. This isn't a fix for those bugs, but it does work + around it for now. LP: #554172. + + -- Scott James Remnant Thu, 12 Aug 2010 09:52:07 -0400 + +upstart (0.6.6-1ubuntu1) maverick; urgency=low + + * Try buying with -fPIE/-pie on armel again; we have a shiny new armel + toolchain and this part of the rules was broken in 0.6.6-1 anyway. + + -- Loïc Minier Fri, 23 Jul 2010 14:54:11 +0200 + +upstart (0.6.6-1) maverick; urgency=low + + * New upstream release: + - All changes were previously merged into this package. + + * debian/upstart-job: + - Fix output for the force-reload command to only refer to reload(8). + LP: #532862. + + * Add debian/source/format with "1.0" to be future compatible. + * Add missing ${misc:Depends}. + * Bump standards version. + * Convert rules to dh7 format. + + -- Scott James Remnant Tue, 27 Apr 2010 13:41:18 -0700 + +upstart (0.6.5-6) lucid; urgency=low + + * Merge fixes from trunk: + - double-quoting of NIH_CFLAGS and NIH_DBUS_CFLAGS on --with-local-libnih + - document "env KEY" behaviour + * conf/rc.conf, conf/rc-sysinit.conf: + - enable console output. LP: #548954. + - pass value of INIT_VERBOSE from kernel command-line. + + -- Scott James Remnant Thu, 01 Apr 2010 19:25:36 +0100 + +upstart (0.6.5-5) lucid; urgency=low + + * init/main.c: + - Don't change the settings of the foreground console, this is often + owned by plymouth and not supposed to be in Canonical Mode; all other + paths have stty sane settings anyway (which these are not), so there + really isn't need for init to do this. LP: #540256. + + -- Scott James Remnant Wed, 17 Mar 2010 22:34:55 +0000 + +upstart (0.6.5-4) lucid; urgency=low + + * debian/control: + - change Pre-Depends back to Depends, this was a holdover from when we + attempted to make Upstart Essential to solve early sysvinit→upstart + upgrade issues, we backed out the Essential bit but never the use of + Pre-Depends. LP: #527722. + - add versioned-dependencies on ifupdown for loopback fix that can + prevent initscripts from being run. LP: #527830. + + * Merge patches from trunk to use /proc/self/fd instead of /dev/fd, and + to always mount /proc and /sys on boot. + + -- Scott James Remnant Fri, 26 Feb 2010 15:40:58 +0000 + +upstart (0.6.5-3) lucid; urgency=low + + * udev/upstart-udev-bridge.c: use right variable name, fixing a build + failure. (LP: #524484) + + -- Scott Moser Fri, 19 Feb 2010 10:21:33 -0500 + +upstart (0.6.5-2) lucid; urgency=low + + * udev/upstart-udev-bridge.c: + - Increase receiving buffer size for uevents so we don't miss any. + LP: #504883. + + -- Scott James Remnant Wed, 17 Feb 2010 15:50:40 +0000 + +upstart (0.6.5-1) lucid; urgency=low + + * New upstream release: + - libnih has been separated out into its own project. + - "start on" and "stop on" now support != matches. LP: #513035. + - Fixed crash in child when unable to spawn job. LP: #451917. + - No longer holds /dev/console open so SAK won't kill init. LP: #486005. + - Added missing OPTIONS section to init(8). LP: #449883. + + [ Scott James Remnant ] + * Build-depend on libnih-dev, libnih-dbus-dev and nih-dbus-tool to use + the separated out libnih. + - This has the fix for LP: #436758. + - Remove changelog.nih from the doc directory. + * Bump udev build-dependency to 147 to match upstream. + * udev/Makefile.am: Update to use external libnih + + [ Johan Kiviniemi ] + * udev/upstart-udev-bridge.c: Change -device-remove to -device-removed to + match -device-added and -device-changed. LP: #516698. + + -- Scott James Remnant Thu, 04 Feb 2010 16:30:10 -0800 + +upstart (0.6.3-11build1) lucid; urgency=low + + * Rebuild to pick up relaxed dependency on libc6, after checking that + __abort_msg is available with the same signature in eglibc 2.11. + LP: #508702. + + -- Matthias Klose Mon, 18 Jan 2010 16:10:11 +0100 + +upstart (0.6.3-11) karmic-proposed; urgency=low + + * Make rc-sysinit.conf wait on the loopback interface, to ensure that the + interface is up before we process the scripts in /etc/rc?.d. LP: #461725. + + -- Steve Langasek Tue, 08 Dec 2009 12:58:37 -0800 + +upstart (0.6.3-10) karmic; urgency=low + + * Retain the "telinit u" for the case when we're upgrading from pre-0.6 + (ie. hardy or jaunty). Whups. LP: #451556. + + -- Scott James Remnant Thu, 15 Oct 2009 17:48:47 +0100 + +upstart (0.6.3-9) karmic; urgency=low + + * Restore the call to sync() in reboot, have been observing some issues + and it looks like ext4 might not be explicitly flushing the disk when + remounting read-only. + + -- Scott James Remnant Wed, 14 Oct 2009 16:40:32 +0100 + +upstart (0.6.3-8) karmic; urgency=low + + * Rather than calling "telinit u" after upgrade, which will lose state, + have the umountroot initscript take care of it for us by setting a + flag. LP: #441796. + * Don't lose the original default runlevel if /etc/inittab exists without + an initdefault line. LP: #405847. + * Fix "unhandled error" in shutdown when unable to change runlevel, + e.g. due to previous Ubiquity bug. LP: #426332. + * Merge change from trunk that makes it possible to build Upstart using + a previously built copy of nih-dbus-tool, especially useful when + cross-compiling. LP: #426740. + * Merge change from libnih to store our assertion messages in the + glibc __abort_msg symbol so apport can pick them up. LP: #429411. + * Merge change from libnih to fix compilation issue with eglibc due + to changed alphasort() prototype. + + -- Scott James Remnant Wed, 14 Oct 2009 05:34:13 +0100 + +upstart (0.6.3-7) karmic; urgency=low + + * Ignore initramfs pids that don't exist. LP: #440071. + - you still need to ensure that the pid's parent is init, there's no + cheap way to test for that. + * Remove "console owner" and "console output" from rc scripts. + * Try harder to remove dbus-reconnect.conf + + -- Scott James Remnant Fri, 02 Oct 2009 21:09:03 +0100 + +upstart (0.6.3-6) karmic; urgency=low + + * Don't use "telinit q" to reconnect to D-Bus, since that breaks + lots of things. Invent another secret way instead. + + [ Steve Langasek ] + * upstart-job's restart target must also not fail when the service is not + yet started. LP: #430883. + + -- Scott James Remnant Thu, 01 Oct 2009 15:26:19 +0100 + +upstart (0.6.3-5) karmic; urgency=low + + * Update autoconf and automake files. LP: #435252. + + -- Scott James Remnant Wed, 23 Sep 2009 14:16:34 -0700 + +upstart (0.6.3-4) karmic; urgency=low + + [ Scott James Remnant ] + * Reduce the priority of the stopped by/continued by messages so that + they are only shown when --verbose on the kernel command-line. + LP: #401333. + * Add a hack to look for /dev/.initramfs/*.pid files on startup and + "fake" start jobs of those names. Basically this means that "status" + and "stop" work for things like bootchart and usplash. + * Implement a "reload" command in initctl that retrieves the current pid + of the job and sends it the HUP signal. LP: #433544. + + [ Steve Langasek ] + * debian/upstart-job: + - give proper policy-compliant behavior of the start command: detect if + the job is already running using upstart status, and if so return success. + - same for the stop command: return success if the job is already stopped. + - when $DPKG_MAINTSCRIPT_PACKAGE is set, don't spit warnings out because + it's not the user's fault - we're being invoked by a maintainer script. + + -- Scott James Remnant Tue, 22 Sep 2009 13:56:48 -0700 + +upstart (0.6.3-3) karmic; urgency=low + + * debian/upstart-job: + - force-reload should only send a HUP signal, since it may not be wise + to actually restart (cf. dbus) + + -- Scott James Remnant Wed, 16 Sep 2009 00:10:13 +0100 + +upstart (0.6.3-2) karmic; urgency=low + + FFE LP: #427356. + + * debian/upstart-job: + - Remove trailing "s" from file + - Support direct invocation better. + * udev/upstart-udev-bridge.c: + - New tool to capture events from the udev netlink socket and + convert into upstart events. + * conf/rc-sysinit.conf: + - Run once all filesystems are mounted, rather than on startup + * debian/control: + - Add dependency on mountall for the filesystem event. + + -- Scott James Remnant Tue, 15 Sep 2009 03:19:09 +0100 + +upstart (0.6.3-1) karmic; urgency=low + + * New upstream release: + - Fixed assertion when a job exits while stopping. LP: #406408. + - Fixed compilation on ia64. + - nih-dbus-tool(1) manpage no longer installed. + + -- Scott James Remnant Mon, 03 Aug 2009 23:58:47 +0100 + +upstart (0.6.2-2) unstable; urgency=low + + * debian/patches/10-ptrace_include_cleanup.patch + - Cleanup header includes. Only include ptrace.h in files that actually + need it. This also fixes a build failure on ia64. + * debian/rules + - Run dh_install with --list-missing. + + -- Michael Biebl Tue, 28 Jul 2009 15:50:20 +0200 + +upstart (0.6.2-1) karmic; urgency=low + + * New upstream release: + - Fixed assertion when stopping a job during its starting event. + - Fixed fork following to not stop on exec() before fork() + - Fixed missing chdir() in crash handler. + + -- Scott James Remnant Wed, 22 Jul 2009 10:39:50 +0100 + +upstart (0.6.1-1) karmic; urgency=low + + * New upstream release: + - Fixed race condition in ptrace() code. LP: #264711. + - Fixed runlevel to output "unknown" not "N N". LP: #400248. + - Fixed runlevel to prefix error messages with filename. LP: #400241. + + * Provide/Conflict/Replace the agreed "upstart-job" meta-package. + LP: #399799. + * Bump dpkg dependency to 1.2.16 + + -- Scott James Remnant Thu, 16 Jul 2009 18:26:23 +0100 + +upstart (0.6.0-5) karmic; urgency=low + + * Cherry-pick patch from -r1188 to fix "expect fork" and "expect daemon" + LP: #264711. + + -- Scott James Remnant Tue, 14 Jul 2009 15:19:17 +0100 + +upstart (0.6.0-4) karmic; urgency=low + + * Don't build the testsuite with -fPIE on armel; LP: #398403. + + -- Loïc Minier Mon, 13 Jul 2009 22:12:34 +0200 + +upstart (0.6.0-3) karmic; urgency=low + + * Add Conflicts on older Upstart packages to make update-manager's + job easier. + + -- Scott James Remnant Fri, 10 Jul 2009 10:11:21 +0100 + +upstart (0.6.0-2) karmic; urgency=low + + * Bump D-Bus build dependency to ensure we get the container abandonment + patches, and the GIT version bump. + * Actually ship /lib/init/upstart-job + + -- Scott James Remnant Thu, 09 Jul 2009 17:29:59 +0100 + +upstart (0.6.0-1) karmic; urgency=low + + * New upstream release ("How appropriate, you fight like a cow") + - my customary changes list since pointless, it's basically a + complete rewrite. + - Handles /bin/sh symlink disappearing. LP: #65024. + - Boot parameters may be passed to init scripts. LP: #74664. + - reboot implies --force during shutdown. LP: #388738. + - reboot no longer iterates /proc/ide. LP: #92685. + - much improved documentation. LP: #60429, #72058, #388715. + + * Merge the various upstart packages into a single package, it makes + little sense to have it all spread out. + + -- Scott James Remnant Wed, 08 Jul 2009 23:12:03 +0100 + +upstart (0.3.10-2) karmic; urgency=low + + * debian/upstart.postinst: Use telinit u to re-exec, rather than + kill just in case it's not Upstart that's running. LP: #92177. + * debian/event.d/system-services/tty*: Run getty in 8-bit clean + mode. LP: #273189. + * debian/event.d/upstart-compat-sysv/rc-default: + - Don't use grep -w, instead split on $IFS and iterate. LP: #385911. + - Check for any valid runlevel, not just S. LP: #85014. + - Make console owner, since it may spawn sulogin. + * debian/event.d/upstart-compat-sysv/rcS: + - Spawn sulogin if given -b or "emergency". LP: #193810. + * debian/event.d/upstart-compat-sysv/rcS: + - Make console owner. LP: #211402. + * debian/event.d/upstart-compat-sysv/rcS-sulogin: + - Place the telinit code in post-stop, checking $UPSTART_EVENT first so + we don't change the runlevel if we were stopped due to a runlevel + change. LP: #66002. + + -- Scott James Remnant Thu, 18 Jun 2009 16:19:34 +0100 + +upstart (0.3.10-1) karmic; urgency=low + + * Compilation fixes. + * Fixed assertion caused by the post-start or pre-stop scripts + exiting after the main process of a respawning job had exited. + LP: #381048. + + -- Scott James Remnant Wed, 17 Jun 2009 13:33:40 +0100 + +upstart (0.3.9-8) intrepid; urgency=low + + * Do not attempt to continue communicating with the restarted upstart + (LP: #273761). + + -- Kees Cook Mon, 29 Sep 2008 13:35:21 -0700 + +upstart (0.3.9-7) intrepid; urgency=low + + * Implement "telinit u" by just sending Upstart SIGTERM with a slightly + different patch than Fedora. LP: #188925. + + -- Scott James Remnant Tue, 23 Sep 2008 09:01:09 -0700 + +upstart (0.3.9-6) intrepid; urgency=low + + * Really fix LP: #237276 properly this time, lost the change while mucking + around with bzr. + + -- Scott James Remnant Wed, 04 Jun 2008 22:29:48 +0100 + +upstart (0.3.9-5) intrepid; urgency=low + + * Correct build problem on amd64 and ia64 by only building libnih and + libupstart statically. The shared objects were unwanted, and conflict + with -fPIE. + + -- Scott James Remnant Wed, 04 Jun 2008 17:07:12 +0100 + +upstart (0.3.9-4) intrepid; urgency=low + + * Add missing limits.h, required to build with current libc. + + -- Scott James Remnant Wed, 04 Jun 2008 13:09:32 +0100 + +upstart (0.3.9-3) intrepid; urgency=low + + * Change dependency from sysvutils to sysvinit-utils. LP: #237276. + * Compile with stack -fstack-protector, -fPIE, -z relro, -z now and -pie + (MMmm, pie) + + -- Scott James Remnant Wed, 04 Jun 2008 12:59:11 +0100 + +upstart (0.3.9-2) hardy; urgency=low + + * Start the getty on tty1 after the rc script has stopped rather then + at the same time it starts to avoid overwriting by console messages. + tty2..6 will still be active if you want an early login. LP: #65230. + * If the recovery menu is available start that instead of sulogin when + entering single-user-mode. + + -- Scott James Remnant Fri, 11 Apr 2008 13:38:50 +0100 + +upstart (0.3.9-1) hardy; urgency=low + + * New upstream release: + - many bug fixes. + + * Update reference to "edgy" in README.Debian to "hardy". LP: #140037. + + -- Scott James Remnant Sun, 28 Oct 2007 10:51:59 -0400 + +upstart (0.3.8-2) gutsy; urgency=low + + * Fix broken migration of old-style 'respawn process' stanzas which + produced corrupted 'exec' stanzas. Try to fix up files previously + corrupted by this. LP: #95210 + + -- Scott James Remnant Sun, 28 Oct 2007 10:50:36 -0400 + +upstart (0.3.8-1) feisty; urgency=low + + * New upstream release: + - much improved initctl tool. + + * Update my standard prep_/undo_/rm_conffile functions to take into account + current dpkg behaviour wrt obsolete conffiles. The conffile is now moved + out of the way in preinst and the moved file deleted in postinst, or moved + back in postrm abort-upgrade. This means it's not there when dpkg + configures the new version, so the conffile is not left in the list. + * Purge backups of modified obsolete conffiles when the package is purged. + + * Update runlevel and respawn rule generated in migrate-inittab.pl + LP: #89314 + + * Drop 00-libnih-update.patch and 01-libnih-sparc-ftbfs.patch; new upstream + release includes an up-to-date libnih which contains both patches. + * Drop 10-cant-stop-execless-job.patch; included upstream. + * Drop 20-complex-event-config.patch; this is going to be significantly + changed upstream, and we don't want to ship something strange. + * Drop 30-fix-warnings.patch; included upstream. + + -- Scott James Remnant Sun, 11 Mar 2007 19:19:00 +0000 + +upstart (0.3.5-2) feisty; urgency=low + + * Changed "start script" to "pre-start script" in sulogin event, the former + is no longer recognised. + + * Applied 01-libnih-sparc-ftbfs.patch; this updates the signal name list + to exclude signals not available on that architecture, and add one that's + unique to it. + * Applied 30-fix-warnings.patch; this corrects a few warnings that spoiled + an otherwise clean build log. + + -- Scott James Remnant Tue, 13 Feb 2007 15:56:33 +0000 + +upstart (0.3.5-1) feisty; urgency=low + + * New upstream release: + - inotify file descriptor leak fixed. LP: #83099. + - inotify support is no longer required. LP: #68904. + - new job state machine + - new event structure, can now include arguments and environment + + * Applied 00-libnih-update.patch; this updates the libnih library to the + latest bzr trunk version, required for the complex-event-config patch. + * Applied 10-cant-stop-execless-job.patch from upstream; this corrects a + bug where jobs without an "exec" or "script" stanza cannot be stopped. + * Applied 20-complex-event-config.patch from upstream; this is an + experimental implementation of the "on" keyword that allows definition + of complex system states. + + * System V compatibility jobs updated to match new event names. + * rcS job now sets PREVLEVEL and RUNLEVEL. LP: #76304. + + * NOTE: After this upgrade, init will appear to have "forgotten" the + process ids of your gettys, etc. This is not a critical problem and + will be fixed before release. Shutdown will still work as normal. + + -- Scott James Remnant Mon, 12 Feb 2007 13:51:40 +0000 + +upstart (0.3.2-1) experimental; urgency=low + + * New upstream release. + * debian/upstart.docs + - Install the NEWS, AUTHORS, TODO, HACKING and ChangeLog.nih file. + + -- Michael Biebl Sat, 10 Feb 2007 18:25:10 +0100 + +upstart (0.3.1-1) feisty; urgency=low + + * New upstream release: + - start, stop and status are now symlinks to initctl, not to a + different, separate utility. + - initctl completely rewritten to behave properly. + - some upstart-specific options to shutdown and reboot dropped, as + these are considered SysV-compat tools. + - "console none" fixed. LP: #70782. + - improved documentation. LP: #68805. + + * shutdown and reboot moved to upstart-compat-sysv. + + * Replace the /usr/share/doc/* directory in upstart-logd, + upstart-compat-sysv, system-services and startup-tasks with a symlink to + /usr/share/doc/upstart. This was actually done in a previous package, + but the migration missed. LP: #70895. + + -- Scott James Remnant Wed, 13 Dec 2006 17:27:37 +0000 + +upstart (0.2.7-7) edgy; urgency=low + + * Don't abort the postinst if we can't send init SIGTERM. Ubuntu: #64499. + + -- Scott James Remnant Tue, 10 Oct 2006 10:13:05 +0100 + +upstart (0.2.7-6) edgy; urgency=low + + * Don't start gettys on tty2 thru tty6 in runlevels 4 and 5 (matches + our sysvinit configuration). + * Migrate common changes made to /etc/inittab to /etc/event.d by + adjusting the installed conffiles. Ubuntu: #61539. + + * Include missing AUTHORS and NEWS file in the upstart package. + * Include README.Debian which answers common questions. Ubuntu: #60429. + + -- Scott James Remnant Thu, 5 Oct 2006 16:08:34 +0100 + +upstart (0.2.7-5) edgy; urgency=low + + * Don't set the current runlevel in /var/run/utmp to 0 or 6 if it is + already either of those two values. That way we don't end up with + either 0 or 6 in the PREVLEVEL variable, which can cause + /etc/init.d/rc to be "efficient" and not bother doing + anything. Ubuntu: #63852. + + -- Scott James Remnant Wed, 4 Oct 2006 14:06:18 +0100 + +upstart (0.2.7-4) edgy; urgency=low + + * Can't just start rc-default once in single-user mode, because if we + boot into that, that will just return us back to sulogin again. Copy + the script out of rc-default into rcS-sulogin to call telinit with the + right default runlevel. Ubuntu: #62189. + + * Add Build-Depend on dpkg-dev (>= 1.13.19) due to our use of + ${binary:Version}. Ubuntu: #61693. + + -- Scott James Remnant Tue, 26 Sep 2006 17:20:42 +0100 + +upstart (0.2.7-3) edgy; urgency=low + + * Set the runlevel to "S" when we enter sulogin so that it appears + in utmp. + + -- Scott James Remnant Thu, 21 Sep 2006 05:37:25 +0100 + +upstart (0.2.7-2) edgy; urgency=low + + * Ensure that the same version of upstart is installed as the version of + upstart-compat-sysv and upstart-logd; as the IPC protocol may change + between releases. + + * Adjust the rcS-sulogin job so that if sulogin exits the default runlevel + is entered; but if the job is stopped (e.g. by shutdown) it isn't. The + solves the regression introduced in the previous release. + + * Revert upstream logd/"quiet" change in favour of doing it in our + lsb logging functions instead; seems to work better (fsvo better). + + -- Scott James Remnant Thu, 21 Sep 2006 03:12:33 +0100 + +upstart (0.2.7-1) edgy; urgency=low + + * New upstream release: + - logd now writes to the console unless "quiet" is specified + - runaway jobs caught when they start rather than respawn. Ubuntu: #59807 + + * Fix failure to shutdown while in single-user mode, however this means + that for edgy you can't exit the sulogin shell to enter the default + runlevel; explicitly say what works. Ubuntu: #60626. + * Drop unnecessary dependency on util-linux. + * Drop sulogin hack, instead depend on the version of sysvutils that + includes the real one. Ubuntu: #60965. + + -- Scott James Remnant Wed, 20 Sep 2006 05:39:16 +0100 + +upstart (0.2.6-1) edgy; urgency=low + + * New upstream release: + - fix infinite loop caused by bad waitid() call. Ubuntu: #59459. + - halt now behaves as "shutdown -h now". Ubuntu: #59720. + + -- Scott James Remnant Wed, 13 Sep 2006 22:16:17 +0100 + +upstart (0.2.5-1debian1) unstable; urgency=low + + * upstart-compat-sysv: Depend on sysvinit-utils instead of sysvutils. + * Set myself as maintainer with approval from martin f. krafft. + * Changed section from base to admin. + * Added a patch to make it compile against glibc 2.3. + + -- Michael Biebl Tue, 12 Sep 2006 16:29:12 +0200 + +upstart (0.2.5-1) edgy; urgency=low + + * New upstream release: + - no longer spins when no stalled event handler. Ubuntu: #59170. + - shutdown works when under sysvinit. Ubuntu: #58523; + - shutdown -k implemented. Ubuntu: #58723. + - telinit sends shutdown event for 0, 1 and 6. Ubuntu: #58913. + - basic manual pages included. Ubuntu: #58724. + + * upstart-compat-sysv Replaces: sysvinit. Ubuntu: #59427. + * upstart Recommends: upstart-compat-sysv, startup-tasks & system-services. + + * New upstart-logd package includes the logd daemon that can will log + output of jobs with "console logged" (the default) in their description + to /var/log/boot. + + * Add /etc/event.d/rc0 that is run on the "halt" event (neither -H or -P + given), and modify rc0-halt to run on "system-halt" (-H given) and + rc0-poweroff to run on "power-off" (-P given). Ubuntu: #59134. + * Fix the control-alt-delete job to run on the "ctrlaltdel" event so + that it's triggered properly. Ubuntu: #59398. + * Fix single-user mode. + + -- Scott James Remnant Sat, 9 Sep 2006 05:10:12 +0100 + +upstart (0.2.1-7) edgy; urgency=low + + * Remove the Essential tags again, they didn't solve the problem we + hoped they would (dpkg/apt still won't remove sysvinit without + serious persuasion) and I don't think these packages should be. + + -- Scott James Remnant Thu, 7 Sep 2006 02:42:33 +0100 + +upstart (0.2.1-6) edgy; urgency=low + + * Make packages Essential, and change Depends to Pre-Depends so that the + packages work when unconfigured (nothing interesting is performed in + postinst). Ubuntu: #59005. + * Sync priority in debian/control with that in the archive (required) + * Drop warning of dire consequences if you install upstart, seeing as it's + installed by default. + + * Add new startup-tasks and system-services packages which will contain + the /etc/event.d files themselves (other than the main ones). + * Move tty definitions into system-services. + * Modify tty definitions to start when the rcS task has finished. This + puts them in the "right" place when compared to gdm. Ubuntu: #58630. + + * Correct rcS compatibility script to ignore any information in utmp so + that all scripts are always run. Ubuntu: #59203. + * Make rcS the console owner while it runs, temporary fix for + Ubuntu: #58609, #58794, #58796 + * Include default control-alt-delete handler that reboots the machine. + + -- Scott James Remnant Wed, 6 Sep 2006 21:52:48 +0100 + +upstart (0.2.1-5) edgy; urgency=low + + * upstart-compat-sysv Depends: initscripts (closes: Malone #58979). + + -- Colin Watson Tue, 5 Sep 2006 12:22:50 +0100 + +upstart (0.2.1-4) edgy; urgency=low + + * Add missing #! line to top of postrm + + -- Scott James Remnant Mon, 4 Sep 2006 08:11:16 +0100 + +upstart (0.2.1-3) edgy; urgency=low + + * Remove the rc0 configuration file shipped in 0.1.0 that causes all + reboots to become shutdowns. Ubuntu: #58557. + + -- Scott James Remnant Sun, 3 Sep 2006 23:24:41 +0100 + +upstart (0.2.1-2) edgy; urgency=low + + * Don't send the SIGTERM signal unless we're upgrading from a version + of upstart that supports re-exec; older versions would cause a kernel + PANIC and change from sysvinit does nothing. + + -- Scott James Remnant Sat, 2 Sep 2006 17:18:38 +0100 + +upstart (0.2.1-1) edgy; urgency=low + + * New upstream release: + - compilation fixes. + + -- Scott James Remnant Fri, 1 Sep 2006 19:51:41 +0100 + +upstart (0.2.0-1) edgy; urgency=low + + * New upstream release: + - upstart includes shutdown, reboot, halt, poweroff, start, stop, status, + runlevel and telinit utilities. + - "initctl list" will list active jobs. + - Events vastly simplified to just simple strings. + + * Compatibility tasks for old rc scripts, along with runlevel and telinit + utilities now shipped in upstart-compat-sysv package. + + -- Scott James Remnant Fri, 1 Sep 2006 02:38:44 +0100 + +upstart (0.1.1-1) edgy; urgency=low + + * New upstream release: + - set PATH and TERM in processes + + -- Scott James Remnant Fri, 25 Aug 2006 16:17:52 +0200 + +upstart (0.1.0-2) edgy; urgency=low + + * Oops, rename /sbin/init to /sbin/upstart as documented. Lost this + while battling bzr. + + -- Scott James Remnant Thu, 24 Aug 2006 16:30:54 +0200 + +upstart (0.1.0-1) edgy; urgency=low + + * Initial release. + + -- Scott James Remnant Thu, 24 Aug 2006 14:27:47 +0200 --- upstart-1.13.2.orig/debian/compat +++ upstart-1.13.2/debian/compat @@ -0,0 +1 @@ +9 --- upstart-1.13.2.orig/debian/conf/console.conf +++ upstart-1.13.2/debian/conf/console.conf @@ -0,0 +1,11 @@ +# console - getty +# +# This service maintains a getty on console from the point the system is +# started until it is shut down again. + +start on stopped rc RUNLEVEL=[2345] and container CONTAINER=lxc + +stop on runlevel [!2345] + +respawn +exec /sbin/getty -8 38400 console --- upstart-1.13.2.orig/debian/conf/container-detect.conf +++ upstart-1.13.2/debian/conf/container-detect.conf @@ -0,0 +1,42 @@ +description "Track if upstart is running in a container" + +start on mounted MOUNTPOINT=/run + +env container +env LIBVIRT_LXC_UUID + +emits container +emits not-container + +pre-start script + # The "standard" way of telling if we are in a container + # is to check for "container" in init's environment. + # The code below is for cases where it's not set. + + # Detect old-style libvirt + if [ -z "$container" ]; then + [ -n "$LIBVIRT_LXC_UUID" ] && container=lxc-libvirt + fi + + # Detect OpenVZ containers + if [ -z "$container" ]; then + [ -d /proc/vz ] && [ ! -d /proc/bc ] && container=openvz + fi + + # Detect Vserver containers + if [ -z "$container" ]; then + VXID="$(cat /proc/self/status | grep ^VxID | cut -f2)" || true + [ "${VXID:-0}" -gt 1 ] && container=vserver + fi + + if [ -n "$container" ]; then + echo "$container" > /run/container_type || true + initctl emit --no-wait container CONTAINER=$container + exit 0 + fi + + # If not a container, stop there + rm -f /run/container_type + initctl emit --no-wait not-container + stop +end script --- upstart-1.13.2.orig/debian/conf/failsafe.conf +++ upstart-1.13.2/debian/conf/failsafe.conf @@ -0,0 +1,44 @@ +# failsafe + +description "Failsafe Boot Delay" +author "Clint Byrum " + +start on filesystem and net-device-up IFACE=lo +stop on static-network-up or starting rc-sysinit + +emits failsafe-boot + +console output + +script + # Determine if plymouth is available + if [ -x /bin/plymouth ] && /bin/plymouth --ping ; then + PLYMOUTH=/bin/plymouth + else + PLYMOUTH=":" + fi + + # The point here is to wait for 2 minutes before forcibly booting + # the system. Anything that is in an "or" condition with 'started + # failsafe' in rc-sysinit deserves consideration for mentioning in + # these messages. currently only static-network-up counts for that. + + sleep 20 + + # Plymouth errors should not stop the script because we *must* reach + # the end of this script to avoid letting the system spin forever + # waiting on it to start. + $PLYMOUTH message --text="Waiting for network configuration..." || : + sleep 40 + + $PLYMOUTH message --text="Waiting up to 60 more seconds for network configuration..." || : + sleep 59 + $PLYMOUTH message --text="Booting system without full network configuration..." || : + + # give user 1 second to see this message since plymouth will go + # away as soon as failsafe starts. + sleep 1 + exec initctl emit --no-wait failsafe-boot +end script + +post-start exec logger -t 'failsafe' -p daemon.warning "Failsafe of 120 seconds reached." --- upstart-1.13.2.orig/debian/conf/flush-early-job-log.conf +++ upstart-1.13.2/debian/conf/flush-early-job-log.conf @@ -0,0 +1,11 @@ +# flush-early-job-log - Ensure cached output from jobs that finish +# before the disk is writeable are flushed to disk as soon as it does +# becomes writeable. + +description "flush early job output to logs" + +task + +start on filesystem + +exec initctl notify-disk-writeable --- upstart-1.13.2.orig/debian/conf/rcS.conf +++ upstart-1.13.2/debian/conf/rcS.conf @@ -0,0 +1,28 @@ +# rcS - System V single-user mode compatibility +# +# This task handles the old System V-style single-user mode, this is +# distinct from the other runlevels since running the rc script would +# be bad. + +description "System V single-user mode compatibility" +author "Scott James Remnant " + +start on runlevel S +stop on runlevel [!S] + +console owner +script + exec /sbin/sulogin +end script + +post-stop script + # Don't switch runlevels if we were stopped by an event, since that + # means we're already switching runlevels + if [ -n "${UPSTART_STOP_EVENTS}" ] + then + exit 0 + fi + + # Switch, passing a magic flag + start --no-wait rc-sysinit FROM_SINGLE_USER_MODE=y +end script --- upstart-1.13.2.orig/debian/conf/shutdown.conf +++ upstart-1.13.2/debian/conf/shutdown.conf @@ -0,0 +1,9 @@ +# Trigger an immediate shutdown when upstart receives SIGPWR +# this is useful for some UPS monitoring tools and for clean +# shutdown of containers + +description "Trigger an immediate shutdown on SIGPWR" +start on power-status-changed + +task +exec shutdown -h now "SIGPWR received" --- upstart-1.13.2.orig/debian/conf/tty1.conf +++ upstart-1.13.2/debian/conf/tty1.conf @@ -0,0 +1,14 @@ +# tty1 - getty +# +# This service maintains a getty on tty1 from the point the system is +# started until it is shut down again. + +start on stopped rc RUNLEVEL=[2345] and ( + not-container or + container CONTAINER=lxc or + container CONTAINER=lxc-libvirt) + +stop on runlevel [!2345] + +respawn +exec /sbin/getty -8 38400 tty1 --- upstart-1.13.2.orig/debian/conf/tty2.conf +++ upstart-1.13.2/debian/conf/tty2.conf @@ -0,0 +1,14 @@ +# tty2 - getty +# +# This service maintains a getty on tty2 from the point the system is +# started until it is shut down again. + +start on runlevel [23] and ( + not-container or + container CONTAINER=lxc or + container CONTAINER=lxc-libvirt) + +stop on runlevel [!23] + +respawn +exec /sbin/getty -8 38400 tty2 --- upstart-1.13.2.orig/debian/conf/tty3.conf +++ upstart-1.13.2/debian/conf/tty3.conf @@ -0,0 +1,14 @@ +# tty3 - getty +# +# This service maintains a getty on tty3 from the point the system is +# started until it is shut down again. + +start on runlevel [23] and ( + not-container or + container CONTAINER=lxc or + container CONTAINER=lxc-libvirt) + +stop on runlevel [!23] + +respawn +exec /sbin/getty -8 38400 tty3 --- upstart-1.13.2.orig/debian/conf/tty4.conf +++ upstart-1.13.2/debian/conf/tty4.conf @@ -0,0 +1,14 @@ +# tty4 - getty +# +# This service maintains a getty on tty4 from the point the system is +# started until it is shut down again. + +start on runlevel [23] and ( + not-container or + container CONTAINER=lxc or + container CONTAINER=lxc-libvirt) + +stop on runlevel [!23] + +respawn +exec /sbin/getty -8 38400 tty4 --- upstart-1.13.2.orig/debian/conf/tty5.conf +++ upstart-1.13.2/debian/conf/tty5.conf @@ -0,0 +1,11 @@ +# tty5 - getty +# +# This service maintains a getty on tty5 from the point the system is +# started until it is shut down again. + +start on runlevel [23] and not-container + +stop on runlevel [!23] + +respawn +exec /sbin/getty -8 38400 tty5 --- upstart-1.13.2.orig/debian/conf/tty6.conf +++ upstart-1.13.2/debian/conf/tty6.conf @@ -0,0 +1,11 @@ +# tty6 - getty +# +# This service maintains a getty on tty6 from the point the system is +# started until it is shut down again. + +start on runlevel [23] and not-container + +stop on runlevel [!23] + +respawn +exec /sbin/getty -8 38400 tty6 --- upstart-1.13.2.orig/debian/conf/wait-for-state.conf +++ upstart-1.13.2/debian/conf/wait-for-state.conf @@ -0,0 +1,60 @@ +author "Clint Byrum " +description "Waiting for state" + +task +normal exit 2 + +stop on started $WAIT_FOR or stopped $WAIT_FOR + +# These are all arguments for use influencing how this job waits +env TIMEOUT=30 +env MANUAL_OVERRIDE="N" +env WAIT_FOREVER="N" +env WAIT_STATE="started" +env TARGET_GOAL="start" + +# Required args w/ no sensible default, the tests at the beginning of +# the script are just to guard against WAITER="" or WAIT_FOR="", as the +# instance line will fail if they are not set, since they have no env +instance $WAITER$WAIT_FOR + +script + test -n "$WAIT_FOR" || exit 1 + test -n "$WAITER" || exit 1 + + # We don't want to override the manual stanza + # 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 2>/dev/null; then + exit 0 + fi + ;; + esac + + if [ "$WAIT_STATE" = "stopped" ] ; then + TARGET_GOAL="stop" + fi + + # Already running/stopped? + status $WAIT_FOR | grep -q "$TARGET_GOAL/$WAIT_STATE" && exit 0 + + # Give it a push + $TARGET_GOAL $WAIT_FOR || : + + # upstart will kill this shell on started/stopped $WAIT_FOR + while sleep $TIMEOUT ; do + case $WAIT_FOREVER in + N|n|0) + exit 100 + ;; + Y|y|1) + ;; + *) + exit 1 + ;; + esac + done + # Very strange, sleep returned non-zero? + exit 1 +end script --- upstart-1.13.2.orig/debian/control +++ upstart-1.13.2/debian/control @@ -0,0 +1,103 @@ +Source: upstart +Section: admin +Priority: required +Maintainer: James Hunt +XSBC-Orig-Maintainer: Steve Langasek +Uploaders: Scott James Remnant , James Hunt +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), pkg-config (>= 0.22), libnih-dev (>= 1.0.3), libnih-dbus-dev (>= 1.0.3), nih-dbus-tool (>= 1.0.3), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 151-5), libjson-c-dev (>= 0.10), dbus, bash-completion, dh-autoreconf, autopoint, python3:any, automake (>= 1.12), libdconf-dev, libselinux1-dev [linux-any], libcgmanager-dev [linux-any] +X-Python3-Version: >= 3.2 +Vcs-Bzr: lp:~ubuntu-core-dev/upstart/ubuntu +XS-Debian-Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/collab-maint/upstart/trunk/ +XS-Debian-Vcs-Browser: http://anonscm.debian.org/loggerhead/collab-maint/upstart/trunk/ +Homepage: http://upstart.ubuntu.com/ +XS-Testsuite: autopkgtest + +Package: upstart +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), debianutils (>= 4) +Suggests: python3, graphviz, bash-completion, upstart-monitor +Replaces: upstart-job, sysvinit, startup-tasks, system-services, upstart-bin (<< 1.13.2-0ubuntu10~), init-system-helpers (<< 1.24ubuntu1) +Conflicts: upstart-job, sysvinit, startup-tasks, system-services, lxcguest +Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services +Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8), upstart-bin (<< 1.13.2-0ubuntu10~) +Multi-Arch: foreign +Description: event-based init daemon - essential binaries + upstart is a replacement for the /sbin/init daemon which handles + starting of tasks and services during boot, stopping them during + shutdown and supervising them while the system is running. + . + This package provides all essential upstart components, sufficient + for running user sessions managed by upstart. + +Package: upstart-sysv +Architecture: linux-any +Multi-Arch: foreign +Section: admin +Priority: extra +Conflicts: sysvinit-core, systemd-sysv +Replaces: sysvinit (<< 2.88dsf-44~), sysvinit-core, upstart (<< 1.13.2-0ubuntu10~) +Pre-Depends: upstart, +Depends: ${shlibs:Depends}, ${misc:Depends}, upstart (= ${binary:Version}) +Description: event-based init daemon - SysV links + upstart is a replacement for the /sbin/init daemon which handles + starting of tasks and services during boot, stopping them during + shutdown and supervising them while the system is running. + . + This package provides the manual pages and links needed for upstart + to replace sysvinit. Installing systemd-sysv will overwrite /sbin/init with a + link to upstart. + +Package: upstart-bin +Architecture: all +Priority: extra +Section: oldlibs +Depends: ${shlibs:Depends}, ${misc:Depends}, upstart +Description: event-based init daemon - transitional dummy package + This is a transitional dummy package. It can safely be removed. + +Package: upstart-monitor +Architecture: all +Section: utils +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, upstart (>= 1.7), python3-dbus +Recommends: python3-gi +Description: event monitor for upstart + This package contains a utility that may be run both as a + command-line tool or as a graphical one that displays upstart + events as they are emitted. It is useful for observing system + changes and for determining appropriate events for new jobs. + +Package: upstart-dconf-bridge +Architecture: any +Section: utils +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, upstart (>= 1.10) +Description: DConf bridge for upstart + This package contains a bridge that allows upstart jobs to react when + DConf/gsettings keys are changed. + +Package: libupstart1 +Priority: optional +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Description: Upstart Client Library + The libupstart library allows access to services provided by the Upstart init + daemon without having to use low-level D-Bus calls. + . + This package contains the shared library. + +Package: libupstart-dev +Priority: optional +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libupstart1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Upstart Client Library (development files) + The libupstart library allows access to services provided by the Upstart init + daemon without having to use low-level D-Bus calls. + . + This package contains the static library and C header files which are + needed for developing software using libupstart. --- upstart-1.13.2.orig/debian/copyright +++ upstart-1.13.2/debian/copyright @@ -0,0 +1,19 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: upstart +Upstream-Contact: upstart-devel@lists.ubuntu.com +Source: http://http://launchpad.net/upstart + +Files: * +Copyright: 2009-2013 Canonical Ltd. +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2, as + published by the Free Software Foundation. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian and Ubuntu systems, the complete text of the GNU General Public + License can be found in `/usr/share/common-licenses/GPL-2'. --- upstart-1.13.2.orig/debian/libupstart-dev.install +++ upstart-1.13.2/debian/libupstart-dev.install @@ -0,0 +1,5 @@ +usr/lib/*/libupstart.a +usr/lib/*/libupstart.so +usr/include/upstart.h +usr/include/upstart +usr/lib/*/pkgconfig/libupstart.pc --- upstart-1.13.2.orig/debian/libupstart1.install +++ upstart-1.13.2/debian/libupstart1.install @@ -0,0 +1 @@ +usr/lib/*/libupstart.so.* --- upstart-1.13.2.orig/debian/libupstart1.symbols +++ upstart-1.13.2/debian/libupstart1.symbols @@ -0,0 +1,2 @@ +libupstart.so.1 libupstart1 #MINVER# + *@LIBUPSTART_1.0.0 1.9.1 --- upstart-1.13.2.orig/debian/manpages/upstart-events.7 +++ upstart-1.13.2/debian/manpages/upstart-events.7 @@ -0,0 +1,356 @@ +'\" t +.TH upstart-events 7 2013-12-20 upstart +.\" +.SH NAME +upstart-events \- Well-known Upstart events summary +.\" +.SH Event Summary + +This manual page summarises well-known events generated by Upstart +running both as the +.BR init (8) +daemon (process ID 1) and a Session Init (process that supervises a user +session). + +It is not an exhaustive list of all possible events, but rather details +a standard set of events expected to be generated on any Ubuntu system +running Upstart. + +The primary tables, \fBTable 1\fP and \fBTable 2\fP, encode the +well-known system and session events respectively, along with the type +of each event (listed in \fBTable 3\fP), the emitter of the event (see +\fBTable 4\fP) and the approximate time at which the event could be +generated. Additionally, the \fINote\fP column indexes into \fBTable +5\fP for further details on a particular event. + +See +.BR init (8) +for a table summarising job goals and possible state transitions. + +Note that some events listed in +.B Table 1 +.I may +be available to session jobs (depending on when the Session Init +starts). Those events that are available will be prefixed with +\fI:sys:\fR. See +.BR upstart\-event\-bridge (8) +for further details. + +The \fIRef\fP (Reference) column is used to refer to individual +events succinctly in the \fITime\fP column. + +Note that the \(aq<\(aq and \(aq>\(aq characters in the \fITime\fP column denote +that the event in the \fIEvent\fP column occurs respectively before or +after the event specified in the \fITime\fP column (for example, the +\fBmounting\fP(7) event occurs "at some time" after the \fBstartup\fP(7) +event, and the \fBvirtual\-filesystems\fP(7) event occurs after the last +\fBmounted\fP(7) event relating to a virtual filesystem has been emitted). + +For further details on events, consult the manual pages and the system +job configuration files, usually located in \fI/etc/init\fP. +.\" + +.\" Flush-left to allow table to be viewed on 80-col display without +.\" wrapping. +.nr old_po .po +.nr old_in .in +.po 0 +.in 0 +.sp 1 +\fBTable 1: Well-Known System Events Summary.\fP +.TS +box, tab (@); +c | c | c | c | c | c +c | l | c | c | l | c. +Ref@Event@Type@Emit@Time@Note += + @\fBall\-swaps\fP@S@M@> (5)@ + @\fBcontrol\-alt\-delete\fP(7)@S@A@> (5)@A + @container@S@C@> \fI/run\fP mounted@Q + @dbus\-activation@S@B@> D\-Bus client request@ + @deconfiguring\-networking@H@V@< non-local IFs down@P + @desktop\-session\-start@H@D@> \fBX\fP(7) session created@B + @desktop\-shutdown@H@D@> \fBX\fP(7) session ended@O + @device\-not\-ready@H@M@> (2)@N + @drm\-device\-added@S@U@> (5)@C + @failsafe\-boot@S@X@> (7) and local IF@S + @file@S@K@> (1)@U +7@\fBfilesystem\fP@S@M@After last (1)@D + @graphics\-device\-added@S@U@> (5)@C + @\fBkeyboard\-request\fP(7)@S@A@> (5)@E + @\fBlocal\-filesystems\fP(7)@S@M@> (6)@ + @login\-session\-start@H@D@< DM running@F +1@\fBmounted\fP(7)@H@M@> associated (2)@G +2@\fBmounting\fP(7)@H@M@> (5)@H +3@net\-device\-added@S@U@> (5)@C + @net\-device\-changed@S@U@> (5)@C + @net\-device\-down@S@F@< (4)@C +4@net\-device\-removed@S@U@> (5)@C + @net\-device\-up@S@F,N@> (3)@C + @not\-container@S@C@> \fI/run\fP mounted@Q + @\fBpower\-\%status\-\%changed\fP(7)@S@I@> (5)@I + @recovery@S@G@Boot (<5)@R + @\fBremote\-\%filesystems\fP(7)@S@M@> (6)@ + @rotate\-logs@H@R@daily@Y + @\fBrunlevel\fP(7)@M@T@> (7) + (8)@ + @\fBsocket\fP(7)@S@S@> socket connection@X +5@\fBstartup\fP(7)@S@I@Boot@J + @\fBstarted\fP(7)@S@I@> job started@K + @\fBstarting\fP(7)@H@I@< job starts@K + 8@static\-network\-up@S@N@> last static IF up@ + @\fBstopped\fP(7)@S@I@> job stopped@K + @\fBstopping\fP(7)@H@I@< job stops@K + @T{ +unmounted\-\:remote\-\:filesystems +T}@H@V@T{ +> last remote FS unmounted +T}@L +6@\fBvirtual\-\:filesystems\fP(7)@S@M@> last virtual FS (1)@M +.TE +.po \n[old_po] +.in \n[old_in] +.P +Key: + \(aqDM\(aq is an abbreviation for Display Manager. + \(aqFS\(aq is an abbreviation for filesystem. + \(aqIF\(aq is an abbreviation for Network Interface. + +.\" Flush-left to allow table to be viewed on 80-col display without +.\" wrapping. +.nr old_po .po +.nr old_in .in +.po 0 +.in 0 +.sp 1 +\fBTable 2: Well-Known User Events Summary.\fP +.TS +box, tab (@); +c | c | c | c | c | c +c | l | c | c | l | c. +Ref@Event@Type@Emit@Time@Note += + @dbus@S@L@> (1) @W + @dconf@S@O@> (1) @ + @\fBdesktop\-end\fP(7)@S@J@< (2)@ + @\fBdesktop\-start\fP(7)@H@J@> (3)@ + @file@S@K@> (1)@U +2@\fBsession\-end\fP(7)@M@I@< Session Init end@ +1@\fBstartup\fP(7)@S@I@> Session Init start@J + @:sys:*@S@E@> \fBupstart\-event\-bridge\fP(8) start@ + @:sys:restarted@S@E@> \fBupstart\-event\-bridge\fP(8) start@V +3@xsession@M@H@> (1)@T +.TE +.po \n[old_po] +.in \n[old_in] + +.\" +.P +.sp 1 +.nr old_po .po +.nr old_in .in +.po 0 +.in 0 +\fBTable 3: Event Types.\fP +.TS +box, tab (@); +c | l |l +c | l |l. +Ref@Event Type@Notes += +H@Hook@T{ +Blocking. Waits for events that \fBstart on\fP or \fBstop on\fP this +event. +T} +M@Method@Blocking task. +S@Signal@Non-blocking. +.TE +.po \n[old_po] +.in \n[old_in] + +.\" +.P +.nr old_po .po +.nr old_in .in +.po 0 +.in 0 +.sp 1 +\fBTable 4: Event Emitters.\fP +.TS +box, tab (@); +c | l |l +c | l |l. +Ref@Emitter@Notes += +A@System Administrator (initiator)@Technically emitted by init(8). +B@\fBdbus\-daemon\fP(1)@Run with "\fI\-\-activation=upstart"\fP +C@container\-detect job@ +D@Display Manager@e.g. lightdm/gdm/kdm/xdm. +E@\fBupstart\-event\-bridge\fP(8)@ +F@\fBifup\fP(8) or \fBifdown\fP(8)@See \fI/etc/network/\fP. +G@bootloader or initramfs@ +H@xsession\-init session job@ +I@\fBinit\fP(8)@Either PID 1 or a Session Init. +J@job that starts desktop@gnome\-session job for Ubuntu. +K@\fBupstart\-file\-bridge\fP(8)@See \fBfile\-event\fP(7). +L@\fBupstart\-dbus\-bridge\fP(8)@See \fBdbus\-event\fP(7). +M@\fBmountall\fP(8)@ +N@network\-interface job@ +O@\fBupstart\-dconf\-bridge\fP(8)@See \fBdconf\-event\fP(7). +R@\fI/etc/cron.daily/upstart\fP@See \fBcron\fP(8). +S@\fBupstart\-socket\-bridge\fP(8)@See \fBsocket\-event\fP(7). +T@\fBtelinit\fP(8), \fBshutdown\fP(8)@ +U@\fBupstart\-udev\-bridge\fP(8)@ +V@System V init system@ +X@failsafe job@ +.TE +.po \n[old_po] +.in \n[old_in] + +.\" +.P +.nr old_po .po +.nr old_in .in +.po 0 +.in 0 +\fBTable 5: Event Summary Notes.\fP +.TS +box, tab (@); +c | l +c | l. +Note@Detail += +A@T{ +Requires administrator to press Control-Alt-Delete key +combination on the console. +T} +B@Event generated when user performs graphical login. +C@T{ +These are specific examples. \fBupstart\-udev\-bridge\fP(8) will emit +events which match the pattern, "\fIS\fP\-device\-\fIA\fP" where +\(aqS\(aq is the udev \fIsubsystem\fP and \(aqA\(aq is the udev \fIaction\fP. See +\fBudev\fP(7) and for further details. If you have sysfs +mounted, you can look in \fI/sys/class/\fP for possible values for subsystem. +T} +D@Note this is in the singular - there is no \(aqfilesystems\(aq event. +E@T{ +Emitted when administrator presses Alt-UpArrow key combination on +the console. +T} +F@T{ +Denotes Display Manager running (about to be displayed), but no users +logged in yet. +T} +G@Generated for each mount that completes successfully. +H@T{ +Emitted when mount attempt for single entry from \fBfstab\fP(5) +for any filesystem type is about to begin. +T} +I@Emitted when Upstart receives the SIGPWR signal. +J@Initial event (system or Session Init). +K@T{ +Although the events are emitted by \fBinit\fP(8), the instigator may be +\fBinitctl\fP(8) if a System Administrator has manually started or +stopped a job. +T} +L@\fI/etc/init/umountnfs.sh\fP. +M@Emitted when all virtual filesystems (such as \fI/proc\fR) mounted. +N@T{ +Emitted when the \fI\-\-dev\-wait\-time\fP timeout is exceeded for +\fBmountall\fP(8). This defaults to 30 seconds. +T} +O@T{ +Emitted when the \fIX\fP(7) display manager exits at shutdown or reboot, to +hand off to the shutdown splash manager. +T} +P@T{ +Emitted by /etc/init.d/networking just prior to stopping all non-local +network interfaces. +T} +Q@T{ +Either \(aqcontainer\(aq or \(aqnot-container\(aq is emitted (depending +on the environment), but not both. +T} +R@T{ +Emitted by either the initramfs or bootloader (for example grub) as the \fIinitial\fP +event (rather than \fBstartup\fP(7)) to denote the system has booted into +recovery mode. If recovery was successful, the standard \fBstartup\fP(7) +event is \fIthen\fP emitted, allowing the system to boot as normal. +T} +S@T{ +Emitted to indicate the system has failed to boot within the expected +time. This event will trigger other jobs to forcibly attempt to bring +the system into a usable state. +T} +T@Only emitted for a graphical session. +U@See \fBfile\-event\fP(7). +V@T{ +This is a pseudo-system event emitted directly by the +.BR upstart\-event\-bridge (8) "" . +T} +W@T{ +Emitted by Session Init only since bridge not run as system job by +default. +T} +X@See \fBsocket\-event\fP(7). +Y@T{ +Used primary by Session Job +\fI/usr/share/upstart/sessions/logrotate.conf\fP. +T} +.TE +.po \n[old_po] +.in \n[old_in] + +.\" +.SH AUTHOR +Manual page written by James Hunt +.RB < james.hunt@ubuntu.com > +.\" +.SH REPORTING BUGS +Report bugs at +.RB < https://launchpad.net/ubuntu/+source/upstart/+bugs > +.\" +.SH COPYRIGHT +Copyright \(co 2011-2013 Canonical Ltd. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +.\" +.SH SEE ALSO + +.BR all\-swaps (7), +.BR control\-alt\-delete (7), +.BR dbus\-daemon (1), +.BR dbus\-event (7), +.BR dconf\-event (7), +.BR file\-event (7), +.BR filesystem (7), +.BR ifdown(8) +.BR ifup (8) +.BR init (5), +.BR init (8), +.BR initctl (8), +.BR keyboard\-request (7), +.BR local\-filesystems (7), +.BR mountall (8), +.BR mounted (7), +.BR mounting (7), +.BR power\-status\-changed (7), +.BR remote\-filesystems (7), +.BR runlevel (7), +.BR shutdown (8), +.BR socket\-event (7), +.BR started (7), +.BR starting (7), +.BR startup (7), +.BR stopped (7), +.BR stopping (7), +.BR telinit (8), +.BR upstart\-dbus\-bridge (8), +.BR upstart\-dconf\-bridge (8), +.BR upstart\-event\-bridge (8), +.BR upstart\-file\-bridge (8), +.BR upstart\-local\-bridge (8), +.BR upstart\-socket\-bridge (8), +.BR upstart\-udev\-bridge (8), +.BR virtual\-filesystems (7). + --- upstart-1.13.2.orig/debian/migrate-inittab.pl +++ upstart-1.13.2/debian/migrate-inittab.pl @@ -0,0 +1,143 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +my %gettys; +my $have_cad = 0; + + +#-----------------------------------------------------------------------------# +# Parse /etc/inittab +#-----------------------------------------------------------------------------# + +open INITTAB, "/etc/inittab" + or die "Unable to open /etc/inittab: $!"; + +while () { + chomp; + s/^\s*//; + + next if /^\#/; + next unless length; + + my ($id, $rlevel, $action, $process) = split /:/, $_, 4; + + warn "missing id field" and next + unless defined $id and length $id; + warn "missing runlevel field" and next + unless defined $rlevel; + warn "missing action field" and next + unless defined $action and length $action; + warn "missing process field" and next + unless defined $process; + + + $have_cad = 1 if $action eq "ctrlaltdel"; + $gettys{$1} = [ $rlevel, $process ] if $process =~ /getty.*\b(tty\w+)/; +} + +close INITTAB + or warn "Error while closing /etc/inittab: $!"; + + +#-----------------------------------------------------------------------------# +# Alter /etc/event.d +#-----------------------------------------------------------------------------# + +unlink "/etc/init/control-alt-delete.conf" + unless $have_cad; + +foreach (qw/tty1 tty2 tty3 tty4 tty5 tty6/) { + unlink "/etc/init/$_.conf" + unless exists $gettys{$_}; +} + +foreach (sort keys %gettys) { + my ($rlevel, $process) = @{$gettys{$_}}; + + my @job; + if (-f "/etc/event.d/$_") { + open JOB, "/etc/event.d/$_" + or warn "Unable to open /etc/event.d/$_: $!" and next; + @job = ; + chomp @job; + close JOB + or warn "Error while closing /etc/event,d/$_: $!" and next; + + foreach my $rl (qw/2 3 4 5/) { + my $idx; + for ($idx = 0; $idx < @job; $idx++) { + last if $job[$idx] =~ /^\s*(start|stop)\s+on\s+runlevel\s+$rl\b/; + } + + if ($idx < @job) { + if ($rlevel =~ /$rl/) { + $job[$idx] =~ s/^(\s*)stop(\s+)/$1start$2/; + } else { + $job[$idx] =~ s/^(\s*)start(\s+)/$1stop$2/; + } + } else { + if ($rlevel =~ /$rl/) { + push @job, "start on runlevel $rl"; + } else { + push @job, "stop on runlevel $rl"; + } + } + } + + my $idx; + for ($idx = 0; $idx < @job; $idx++) { + last if $job[$idx] =~ /^\s*respawn\s*/; # match bare 'respawn' too + } + + if ($idx < @job) { + # only match old-style 'respawn process', not bare 'respawn' + $job[$idx] =~ s/^(\s*respawn\s+).*/$1$process/; + } else { + push @job, "respawn"; + push @job, "exec $process"; + } + + # Try to fix up effects of previous broken migrations + if (@job and $job[$#job] =~ /.*(.+?)exec (\1)$/) { + $job[$#job] = "exec $1"; + } + + } else { + push @job, "# $_ - getty"; + push @job, "#"; + push @job, "# Converted from /etc/inittab entry"; + push @job, ""; + + foreach my $rl (qw/2 3 4 5/) { + if ($rlevel =~ /$rl/) { + push @job, "start on runlevel $rl"; + } else { + push @job, "stop on runlevel $rl"; + } + } + push @job, ""; + + push @job, "stop on shutdown"; + push @job, ""; + + push @job, "respawn"; + push @job, "exec $process"; + } + + open JOB, ">/etc/event.d/.$_" + or warn "Unable to write to /etc/event.d/.$_: $!" and next; + print JOB map { "$_\n" } @job; + unless (close JOB) { + warn "Error while closing /etc/event.d/.$_: $!"; + unlink "/etc/event.d/.$_"; + next; + } + + unless (rename "/etc/event.d/.$_", "/etc/event.d/$_") { + warn "Unable to replace /etc/event.d/$_: $!"; + unlink "/etc/event.d/.$_"; + next; + } +} --- upstart-1.13.2.orig/debian/rules +++ upstart-1.13.2/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f + +DEB_BUILD_MAINT_OPTIONS := hardening=+pie,+bindnow +DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed +DEB_CFLAGS_MAINT_APPEND := -Wall + +# Disable optimisations if noopt found in $DEB_BUILD_OPTIONS +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEB_LDFLAGS_MAINT_APPEND += -Wl,-O0 +else + DEB_CFLAGS_MAINT_APPEND += -Os + DEB_LDFLAGS_MAINT_APPEND += -Wl,-O1 +endif + +export DEB_BUILD_MAINT_OPTIONS DEB_LDFLAGS_MAINT_APPEND DEB_CFLAGS_MAINT_APPEND + +%: + dh $@ --with bash-completion,autoreconf,python3 --parallel + +override_dh_auto_configure: + dh_auto_configure -- --exec-prefix= --enable-selinux \ + --disable-silent-rules --disable-abi-check \ + --program-transform-name="s/^init$$/upstart/" + +override_dh_auto_build: + dh_auto_build --parallel + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (0,$(shell id -u)) + # WARNING: RUNNING TESTS AS ROOT IS KNOWN TO FAIL + # WARNING: WILL RUN TESTS, BUT WILL IGNORE FAILURE + -dh_auto_build -- -k check || { RET=$$?; find . -name "test-suite.log" -exec cat {} + ; exit $$RET;} +else + dh_auto_build -- -k check || { RET=$$?; find . -name "test-suite.log" -exec cat {} + ; exit $$RET;} +endif +endif + +override_dh_fixperms: + dh_fixperms + chmod 755 debian/upstart/lib/init/upstart-job + chmod 755 debian/upstart/lib/init/apparmor-profile-load + chmod 755 debian/upstart/usr/lib/upstart/migrate-inittab.pl + +override_dh_auto_install: + dh_auto_install -- pkgconfigdir=\$${libdir}/pkgconfig + +# Remove the appropriate dconf files from the upstart package - they +# will be added used by the upstart-dconf-bridge.install file. +override_dh_install: + dh_install --list-missing + install -m 644 debian/upstart.apport \ + debian/upstart/usr/share/apport/package-hooks/source_upstart.py + rm debian/upstart/usr/share/upstart/sessions/upstart-dconf-bridge.conf + rm debian/upstart/etc/init/upstart-dbus-bridge.conf + +override_dh_installcron: + dh_installcron -p upstart --name upstart --- upstart-1.13.2.orig/debian/source/format +++ upstart-1.13.2/debian/source/format @@ -0,0 +1 @@ +1.0 --- upstart-1.13.2.orig/debian/source/options +++ upstart-1.13.2/debian/source/options @@ -0,0 +1 @@ +--extend-diff-ignore=.*.gmo --- upstart-1.13.2.orig/debian/tests/control +++ upstart-1.13.2/debian/tests/control @@ -0,0 +1,3 @@ +Tests: force +Depends: @, dbus +Restrictions: needs-root build-needed --- upstart-1.13.2.orig/debian/tests/force +++ upstart-1.13.2/debian/tests/force @@ -0,0 +1,13 @@ +#!/bin/sh -e +#--------------------------------------------------------------------- +# Dummy DEP-8 test that does nothing. The reason for having it though +# is to force auto-package-test to build Upstart and thus run its test +# suite. This is not strictly necessary (as we already run it on all +# architectures as part of the package build), running the tests in +# the the virtualised auto-package-test environment (different to the +# buildd environment) has shaken out a few bugs in the past. +#--------------------------------------------------------------------- + +. $(dirname $0)/test_setup + +exit 0 --- upstart-1.13.2.orig/debian/tests/test_setup +++ upstart-1.13.2/debian/tests/test_setup @@ -0,0 +1,25 @@ +#--------------------------------------------------------------------- +# Source this file in all tests +#--------------------------------------------------------------------- + +# user provided by auto-package-testing environment +user=ubuntu + +#------------------------------ +# Assertions + +# We must be running as root initially to perform setup +test $(id -u) -eq 0 || { echo "ERROR: not root"; exit 1; } + +# User must exist +getent passwd $user >/dev/null 2>&1 || \ + { echo "ERROR: no user '$user'"; exit 1; } + +#------------------------------ +# Init + +# we need to run as root, but that means all unpacked files are owned by +# root too. +chown -R ${user}: . .. + +#--------------------------------------------------------------------- --- upstart-1.13.2.orig/debian/upstart-dconf-bridge.install +++ upstart-1.13.2/debian/upstart-dconf-bridge.install @@ -0,0 +1,4 @@ +sbin/upstart-dconf-bridge +usr/share/upstart/sessions/upstart-dconf-bridge.conf +usr/share/man/man8/upstart-dconf-bridge.8 +usr/share/man/man7/dconf-event.7 --- upstart-1.13.2.orig/debian/upstart-job +++ upstart-1.13.2/debian/upstart-job @@ -0,0 +1,119 @@ +#!/bin/sh -e +# upstart-job +# +# Symlink target for initscripts that have been converted to Upstart. + +set -e + +UPSTART_JOB_CONF="/etc/default/upstart-job" +INITSCRIPT="$(basename "$0")" +JOB="${INITSCRIPT%.sh}" + +if [ "$JOB" = "upstart-job" ]; then + if [ -z "$1" ]; then + echo "Usage: upstart-job JOB COMMAND" 1>&2 + exit 1 + fi + + JOB="$1" + INITSCRIPT="$1" + shift +else + if [ -z "$1" ]; then + echo "Usage: $0 COMMAND" 1>&2 + exit 1 + fi +fi + +COMMAND="$1" +shift + +ECHO=echo +ECHO_ERROR=echo +if [ -e "$UPSTART_JOB_CONF" ]; then + . "$UPSTART_JOB_CONF" +fi +if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ]; then + ECHO=: + ECHO_ERROR=: +fi + +$ECHO "Rather than invoking init scripts through /etc/init.d, use the service(8)" +$ECHO "utility, e.g. service $INITSCRIPT $COMMAND" + +# Only check if jobs are disabled if the currently _running_ version of +# Upstart (which may be older than the latest _installed_ version) +# supports such a query. +# +# This check is necessary to handle the scenario when upgrading from a +# release without the 'show-config' command (introduced in +# Upstart for Ubuntu version 0.9.7) since without this check, all +# installed packages with associated Upstart jobs would be considered +# disabled. +# +# Once Upstart can maintain state on re-exec, this change can be +# dropped (since the currently running version of Upstart will always +# match the latest installed version). + +UPSTART_VERSION_RUNNING=$(initctl version|awk '{print $3}'|tr -d ')') + +if dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 0.9.7 +then + initctl show-config -e "$JOB"|grep -q '^ start on' || DISABLED=1 +fi + +case $COMMAND in +status) + $ECHO + $ECHO "Since the script you are attempting to invoke has been converted to an" + $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB" + $COMMAND "$JOB" + ;; +start|stop) + $ECHO + $ECHO "Since the script you are attempting to invoke has been converted to an" + $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB" + if status "$JOB" 2>/dev/null | grep -q ' start/'; then + RUNNING=1 + fi + if [ -z "$RUNNING" ] && [ "$COMMAND" = "stop" ]; then + exit 0 + elif [ -n "$RUNNING" ] && [ "$COMMAND" = "start" ]; then + exit 0 + elif [ -n "$DISABLED" ] && [ "$COMMAND" = "start" ]; then + exit 0 + fi + $COMMAND "$JOB" + ;; +restart) + $ECHO + $ECHO "Since the script you are attempting to invoke has been converted to an" + $ECHO "Upstart job, you may also use the stop(8) and then start(8) utilities," + $ECHO "e.g. stop $JOB ; start $JOB. The restart(8) utility is also available." + if status "$JOB" 2>/dev/null | grep -q ' start/'; then + RUNNING=1 + fi + if [ -n "$RUNNING" ] ; then + stop "$JOB" + fi + # If the job is disabled and is not currently running, the job is + # not restarted. However, if the job is disabled but has been forced into the + # running state, we *do* stop and restart it since this is expected behaviour + # for the admin who forced the start. + if [ -n "$DISABLED" ] && [ -z "$RUNNING" ]; then + exit 0 + fi + start "$JOB" + ;; +reload|force-reload) + $ECHO + $ECHO "Since the script you are attempting to invoke has been converted to an" + $ECHO "Upstart job, you may also use the reload(8) utility, e.g. reload $JOB" + reload "$JOB" + ;; +*) + $ECHO_ERROR + $ECHO_ERROR "The script you are attempting to invoke has been converted to an Upstart" 1>&2 + $ECHO_ERROR "job, but $COMMAND is not supported for Upstart jobs." 1>&2 + exit 1 +esac --- upstart-1.13.2.orig/debian/upstart-monitor.install +++ upstart-1.13.2/debian/upstart-monitor.install @@ -0,0 +1,5 @@ +bin/upstart-monitor usr/bin/ +usr/share/icons/hicolor/scalable/apps/upstart-monitor.svg +usr/share/applications/upstart-monitor.desktop +usr/share/man/man8/upstart-monitor.8 +usr/share/upstart/icons/upstart-monitor.svg --- upstart-1.13.2.orig/debian/upstart-sysv.install +++ upstart-1.13.2/debian/upstart-sysv.install @@ -0,0 +1,13 @@ +sbin/halt +sbin/poweroff +sbin/reboot +sbin/runlevel +sbin/shutdown +usr/share/man/man5/inittab.5 +usr/share/man/man7/runlevel.7 +usr/share/man/man8/shutdown.8 +usr/share/man/man8/runlevel.8 +usr/share/man/man8/reboot.8 +usr/share/man/man8/telinit.8 +usr/share/man/man8/poweroff.8 +usr/share/man/man8/halt.8 --- upstart-1.13.2.orig/debian/upstart-sysv.links +++ upstart-1.13.2/debian/upstart-sysv.links @@ -0,0 +1,3 @@ +sbin/upstart sbin/init +lib/sysvinit/telinit sbin/telinit +usr/share/man/man5/upstart.5.gz usr/share/man/man5/init.5.gz --- upstart-1.13.2.orig/debian/upstart-sysv.postinst +++ upstart-1.13.2/debian/upstart-sysv.postinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +# update grub on first install, so that the alternative init system boot +# entries get updated +if [ "$1" = configure ] && [ -z "$2" ] && [ -e /boot/grub/grub.cfg ] && which update-grub >/dev/null 2>&1; then + update-grub || true +fi + +#DEBHELPER# --- upstart-1.13.2.orig/debian/upstart-xsessions +++ upstart-1.13.2/debian/upstart-xsessions @@ -0,0 +1,18 @@ +# xsessions listed below are run inside an Upstart user session. +gnome +gnome-classic +gnome-fallback +gnome-flashback-metacity +gnome-flashback-compiz +kde-plasma +Lubuntu +Lubuntu-Netbook +lubuntu-nexus7 +lxgames +qlubuntu +ubuntu +ubuntustudio +xfce +xubuntu +unity8-x11 +unity8-mir --- upstart-1.13.2.orig/debian/upstart.apport +++ upstart-1.13.2/debian/upstart.apport @@ -0,0 +1,195 @@ +#!/usr/bin/python +''' +Upstart apport hook. + +Handles both Upstart running as PID 1 and as a Session Init +(non-privileged user). + +Limitations: + +- does not handle non-default --logdir or --confdir. + +''' +import os +import re +import glob +from apport.hookutils import * +import apport.packaging + +msg = \ +""" +The contents of your Upstart job configuration files (*.conf and +*.override) files may help developers diagnose your bug more quickly. +However, if you have modified them, they may contain sensitive +information. + +Do you want to include any modified job configuration files +in your bug report? +""" + +def add_root_file(map, file): + """ + Add @file to @map such that @map can be passed to + attach_root_command_outputs() to have @file attached to the report + event if it is unreadable by the current user. + """ + if not os.path.exists(file): + return + + key = path_to_key(file) + + map[key] = 'cat %s' % file + + +def add_info(report, ui): + system_state_file = '/var/log/upstart/upstart.state' + system_conf_dir = '/etc/init' + session_state_file = None + attach_jobs = False + package = None + + # files that are not readable by current user + unreadable_files = {} + + # Used to determine which details to record. + # + # For crashes, hangs and recoverable problems, attach all possible + # information. + # + # If we are unable to determine a problem category, prompt the user. + category = 'Unknown' + + if 'Package' in report: + package = report['Package'].split()[0] + + problem_type = report.get('ProblemType', '') + + # Determine whether this report relates to a System Init issue, + # or a Session Init one. + + # Crashes and Hangs should be handled automatically without + # prompting. Recoverable Problems should also be dealt with in this + # way since they are essentially informational reports so prompting + # the user is unnecessary and would also only give the user the wrong + # impression. + if problem_type in ('Crash', 'Hang', 'RecoverableProblem'): + if 'ProcStatus' in report: + pid_line = re.search('Pid:\t(.*)\n', report['ProcStatus']) + if pid_line: + upstart_pid = pid_line.groups()[0] + if upstart_pid: + if int(upstart_pid) == 1: + category = 'System' + else: + category = 'Session' + elif ui: + response = ui.choice( + "Upstart is used to supervise both the System and users Desktop\n" + "sessions. Please choose the option that is most appropriate\n" + "for the problem you wish to report\n", + ['System', 'Desktop Session']) + if response == None: + pass + if 0 in response: + category = 'System' + elif 1 in response: + category = 'Session' + + report['UpstartBugCategory'] = category + + if problem_type in ('Crash', 'Hang', 'RecoverableProblem'): + # crash bugs are private by default + attach_jobs = True + elif ui and ui.yesno(msg) == True: + attach_jobs = True + + if category == 'System' or category == 'Unknown': + attach_file(report, '/proc/cmdline', 'ProcKernelCmdline') + + # console output + attach_file_if_exists(report, '/var/log/boot.log', 'BootLog') + + if attach_jobs == True: + + # Map of files => package names where each file is an Upstart + # job configuration file. + file_map = {} + + for file in \ + glob.glob("%s/*.conf" % system_conf_dir) + \ + glob.glob("%s/*.override" % system_conf_dir): + + # try and determine which package owns the file + owner = apport.packaging.get_file_package(file) + + if owner == None: + # If no package owns it, it's either an admin-created + # job, or from a manually installed package, so attach. + # XXX: We don't use attach_file() since, although it + # handles unreadable files in a sense (by returning + # an error string), it does not allow us to grab the + # file contents. + add_root_file(unreadable_files, file) + elif owner != package and owner not in set(file_map.values()): + # If the file is owned by another package, + # record the package name. + # + # XXX: note that we exclude the file if it is owned by + # the Upstart package itself since the general hooks + # already look for modified conffiles. + file_map[file] = owner + + # Attach all modified conffiles for all packages which + # provide Upstart jobs. + for pkg in set(file_map.values()): + attach_conffiles(report, pkg) + + if category == 'Session' or category == 'Unknown': + log_dir = os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache/upstart/')) + conf_dir = os.getenv('XDG_CONFIG_HOME', os.path.expanduser('~/.config/upstart/')) + old_conf_dir = os.path.expanduser('~/.init/') + session_state_file = os.path.join(log_dir, 'upstart.state') + + if attach_jobs == True: + for file in \ + glob.glob("%s/*.conf" % conf_dir) + \ + glob.glob("%s/*.override" % conf_dir) + \ + glob.glob("%s/*.conf" % old_conf_dir) + \ + glob.glob("%s/*.override" % old_conf_dir): + attach_file(report, file) + + add_root_file(unreadable_files, system_state_file) + + attach_root_command_outputs(report, unreadable_files) + + if session_state_file: + attach_file_if_exists(report, session_state_file) + + if os.path.exists(system_state_file) or (session_state_file and os.path.exists(session_state_file)): + report['Tags'] += ' ' + 'upstart-stateful-reexec-failed' + + report['UpstartRunningSystemVersion'] = command_output(['initctl', '--system', 'version']) + + if category == 'System' or category == 'Unknown': + ursysj = command_output(['initctl', '--system', 'list']) + report['UpstartRunningSystemJobs'] = \ + '\n'.join(sorted(ursysj.split('\n'))) + + session_count = 0 + if category == 'Session' or category == 'Unknown': + sessions = command_output(['initctl', 'list-sessions']).split('\n') + if sessions and sessions[0]: + session_count = len(sessions) + report['UpstartRunningSessionCount'] = str(session_count) + + # join the running session if possible + if not os.environ.get('UPSTART_SESSION', None) and session_count == 1: + session = sessions[0].strip().split()[1] + if session: + os.environ['UPSTART_SESSION'] = session + + if os.environ.get('UPSTART_SESSION', None): + report['UpstartRunningSessionVersion'] = command_output(['initctl', 'version']) + ursesj = command_output(['initctl', 'list']) + report['UpstartRunningSessionJobs'] = \ + '\n'.join(sorted(ursesj.split('\n'))) --- upstart-1.13.2.orig/debian/upstart.bash-completion +++ upstart-1.13.2/debian/upstart.bash-completion @@ -0,0 +1 @@ +contrib/bash_completion/upstart --- upstart-1.13.2.orig/debian/upstart.dirs +++ upstart-1.13.2/debian/upstart.dirs @@ -0,0 +1,2 @@ +usr/share/apport/package-hooks +var/log/upstart --- upstart-1.13.2.orig/debian/upstart.docs +++ upstart-1.13.2/debian/upstart.docs @@ -0,0 +1,4 @@ +NEWS +AUTHORS +TODO +HACKING --- upstart-1.13.2.orig/debian/upstart.install +++ upstart-1.13.2/debian/upstart.install @@ -0,0 +1,59 @@ +bin/init-checkconf usr/bin/ +bin/initctl2dot usr/bin/ +debian/apparmor-profile-load lib/init/ +debian/conf/*.conf etc/init/ +debian/migrate-inittab.pl usr/lib/upstart/ +debian/upstart-job lib/init/ +debian/upstart-xsessions etc/ +debian/user-conf/*.conf usr/share/upstart/sessions/ +debian/xsession.d/* etc/X11/Xsession.d/ +etc/init/*.conf +etc/dbus-1/system.d/Upstart.conf +sbin/initctl +sbin/telinit lib/sysvinit/ +sbin/reload +sbin/restart +sbin/start +sbin/status +sbin/stop +sbin/upstart +sbin/upstart-dbus-bridge +sbin/upstart-event-bridge +sbin/upstart-file-bridge +sbin/upstart-local-bridge +sbin/upstart-socket-bridge +sbin/upstart-udev-bridge +usr/share/man/man5/upstart.5 +usr/share/man/man7/control-alt-delete.7 +usr/share/man/man7/dbus-event.7 +usr/share/man/man7/drm-device-added.7 +usr/share/man/man7/graphics-device-added.7 +usr/share/man/man7/file-event.7 +usr/share/man/man7/keyboard-request.7 +usr/share/man/man7/net-device-added.7 +usr/share/man/man7/net-device-removed.7 +usr/share/man/man7/power-status-changed.7 +usr/share/man/man7/socket-event.7 +usr/share/man/man7/starting.7 +usr/share/man/man7/stopping.7 +usr/share/man/man7/session-end.7 +usr/share/man/man7/startup.7 +usr/share/man/man7/started.7 +usr/share/man/man7/stopped.7 +usr/share/man/man7/upstart.7 +usr/share/man/man8/init-checkconf.8 +usr/share/man/man8/initctl.8 +usr/share/man/man8/initctl2dot.8 +usr/share/man/man8/start.8 +usr/share/man/man8/status.8 +usr/share/man/man8/stop.8 +usr/share/man/man8/reload.8 +usr/share/man/man8/restart.8 +usr/share/man/man8/upstart.8 +usr/share/man/man8/upstart-dbus-bridge.8 +usr/share/man/man8/upstart-event-bridge.8 +usr/share/man/man8/upstart-file-bridge.8 +usr/share/man/man8/upstart-local-bridge.8 +usr/share/man/man8/upstart-socket-bridge.8 +usr/share/man/man8/upstart-udev-bridge.8 +usr/share/upstart/sessions/* --- upstart-1.13.2.orig/debian/upstart.logrotate +++ upstart-1.13.2/debian/upstart.logrotate @@ -0,0 +1,8 @@ +/var/log/upstart/*.log { + daily + missingok + rotate 7 + compress + notifempty + nocreate +} --- upstart-1.13.2.orig/debian/upstart.maintscript +++ upstart-1.13.2/debian/upstart.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/init/upstart-dbus-bridge.conf 1.9.1-0ubuntu4 --- upstart-1.13.2.orig/debian/upstart.manpages +++ upstart-1.13.2/debian/upstart.manpages @@ -0,0 +1 @@ +debian/manpages/* --- upstart-1.13.2.orig/debian/upstart.postinst +++ upstart-1.13.2/debian/upstart.postinst @@ -0,0 +1,67 @@ +#!/bin/sh -e + +if ! ischroot; then + # Do not honour re-exec when requested from within a + # chroot since: + # + # (a) The version of Upstart outside might not support it. + # (b) An isolated environment such as a chroot should + # not be able to modify its containing environment. + # + # A sufficiently new Upstart will actually handle a re-exec + # request coming from telinit within a chroot correctly, + # but it's simple enough to perform the check here and save + # Upstart the effort. + + # Query running version of Upstart, but only when we know + # that initctl will work. + # + # The calculated version string may be the null string if + # Upstart is not running (where for example an alternative + # init is running outside a chroot environment) or if the + # query failed for some reason. However, the version check + # below handles a null version string correctly. + UPSTART_VERSION_RUNNING=$(initctl version 2>/dev/null |\ + awk '{print $3}'|tr -d ')' || :) + + if dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 1.9 || [ "$UPSTART_VERSION_RUNNING" = 1.8-ubuntu-full-serialization ]; then + # We are not running inside a chroot and the running version + # of Upstart supports lossless stateful re-exec, so we can + # restart immediately. + # + # XXX: Note that the check on the running version must + # remain *indefinitely* since it's the only safe way to + # know if stateful re-exec is supported: simply checking + # packaged version numbers is not sufficient since + # the package could be upgraded multiple times without a + # reboot. + telinit u || : + elif [ "$UPSTART_JOB" = "cloud-config" ]; then + # If upgraded by cloud-init, do not perform partial + # stateful re-exec, as cloud-init instance will fail + # to initialise. + touch /var/run/init.upgraded || : + [ -x /usr/share/update-notifier/notify-reboot-required ] && \ + /usr/share/update-notifier/notify-reboot-required || true + + elif dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 1.6.1; then + # Otherwise, perform partial stateful re-exec and + # request a reboot. + telinit u || : + [ -x /usr/share/update-notifier/notify-reboot-required ] && \ + /usr/share/update-notifier/notify-reboot-required || true + else + # Before we shutdown or reboot, we need to re-exec so that we + # can safely remount the root filesystem; we can't just do that + # here because we lose state. + touch /var/run/init.upgraded || : + fi +fi + +# update grub on first install, so that the alternative init system boot +# entries get updated +if [ "$1" = configure ] && [ -z "$2" ] && [ -e /boot/grub/grub.cfg ] && which update-grub >/dev/null 2>&1; then + update-grub || true +fi + +#DEBHELPER# --- upstart-1.13.2.orig/debian/upstart.upstart.cron.daily +++ upstart-1.13.2/debian/upstart.upstart.cron.daily @@ -0,0 +1,34 @@ +#!/bin/sh + +# For each Upstart Session Init, emit "rotate-logs" event, requesting +# the session Inits to rotate their logs. There is no user-daily cron. +# +# Doing it this way does not rely on System Upstart, nor +# upstart-event-bridge(8) running in the Session Init. +# +# Note that system-level Upstart logs are handled separately using a +# logrotate script. + +[ -x /sbin/initctl ] || exit 0 + +for file in /run/user/*/upstart/sessions/*.session +do + [ -f "$file" ] || continue + [ -h "$file" ] && continue + + file_uid=$(stat -c %u "$file") + [ -n "$file_uid" ] || continue + + session=$(grep \ + "^UPSTART_SESSION=unix:abstract=/com/ubuntu/upstart-session/[0-9][0-9]*/[0-9][0-9]*$" \ + "$file" 2>/dev/null || true) + [ -n "$session" ] || continue + + session_uid=$(echo "$session" | cut -d\/ -f5) + [ -n "$session_uid" ] || continue + + # Don't allow a user to spoof logrotation for another user. + [ "$file_uid" = "$session_uid" ] || continue + + env -i "$session" /sbin/initctl emit rotate-logs >/dev/null 2>&1 || true +done --- upstart-1.13.2.orig/debian/user-conf/logrotate.conf +++ upstart-1.13.2/debian/user-conf/logrotate.conf @@ -0,0 +1,66 @@ +# logrotate - rotate Upstart job log files to conserve disk space. +# +# Currently runs automatically 1 minute after session starts (to give +# jobs a chance to settle). However, can be run manually any time using +# 'start logrotate' to force logs to be rotated in low-disk space +# scenarios. + +description "Rotate job log files" + +start on startup or :sys:rotate-logs or rotate-logs + +task + +pre-start script + +logrotate=$(command -v logrotate 2>/dev/null || :) + +# logrotate is not installed +[ -z "$logrotate" ] && exit 0 + +# started by event, so run logrotate normally +[ -n "$UPSTART_EVENTS" ] && exit 0 + +# started manually, so force a rotation +initctl set-env FORCE=--force + +end script + +script + +# started by event, so allow time for main jobs to settle +[ -n "$UPSTART_EVENTS" ] && [ "$UPSTART_EVENTS" = startup ] && sleep 60 + +statedir=${XDG_CACHE_HOME:-$HOME/.cache}/logrotate +statefile="$statedir/status" + +logdir=${XDG_CACHE_HOME:-$HOME/.cache}/upstart + +mkdir -p "$statedir" || : +mkdir -p "$logdir" || : + +# Sometimes the state file can become corrupt (probably caused by +# logrotate updating it on shutdown). In these cases the file ends in +# nul bytes which causes a subsequent logrotate run (even a forced run) +# to refuse to process it meaning no files get rotated. +# +# Hence, if nul bytes are detected, reset the state file to allow logrotate +# to work. +[ -e "$statefile" ] && egrep '[^[:print:]]' "$statefile" && rm "$statefile" + +conf=$(mktemp) + +cat <$conf +"$logdir/*.log" { + hourly + missingok + rotate 7 + compress + notifempty + nocreate +} +EOF + +logrotate $FORCE -s "$statefile" "$conf" || : +rm -f "$conf" +end script --- upstart-1.13.2.orig/debian/user-conf/xsession-init.conf +++ upstart-1.13.2/debian/user-conf/xsession-init.conf @@ -0,0 +1,15 @@ +description "XSession handling" +author "Stéphane Graber " + +start on startup +emits xsession +task + +pre-start script + [ -z "$DESKTOP_SESSION" ] && stop || true + [ "$SESSIONTYPE" = "gnome-session" ] && initctl set-env --global GNOME_DESKTOP_SESSION_ID=this-is-deprecated || true +end script + +script + exec initctl emit --no-wait xsession SESSION=$DESKTOP_SESSION SESSIONTYPE=$SESSIONTYPE +end script --- upstart-1.13.2.orig/debian/watch +++ upstart-1.13.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://upstart.ubuntu.com/download/([\d\.]+)/upstart-(.*)\.tar\.gz --- upstart-1.13.2.orig/debian/xsession.d/00upstart +++ upstart-1.13.2/debian/xsession.d/00upstart @@ -0,0 +1,12 @@ +# Make ubuntu-upstart an alias for ubuntu +if grep -q "^$DESKTOP_SESSION\$" /etc/upstart-xsessions; then + export XDG_CONFIG_DIRS="/usr/share/upstart/xdg:/etc/xdg" + + BASESESSION=${1% *} + BASESESSION=${BASESESSION##*/} + if [ "$BASESESSION" = x-session-manager ]; then + BASESESSION=$(basename $(readlink /etc/alternatives/x-session-manager)) + fi + + UPSTART=1 +fi --- upstart-1.13.2.orig/debian/xsession.d/99upstart +++ upstart-1.13.2/debian/xsession.d/99upstart @@ -0,0 +1,14 @@ +# Start the user session +if [ -n "$UPSTART" ]; then + case "$BASESESSION" in + gnome-session*|gnome-flashback*) + export SESSIONTYPE=gnome-session + ;; + lxsession*) + export SESSIONTYPE=lxsession + ;; + esac + + STARTUP="/sbin/upstart --user" + unset UPSTART +fi --- upstart-1.13.2.orig/extra/Makefile.am +++ upstart-1.13.2/extra/Makefile.am @@ -23,6 +23,7 @@ conf-session/upstart-event-bridge.conf \ conf-session/upstart-file-bridge.conf \ conf-session/re-exec.conf \ + conf-session/upstart-udev-bridge.conf \ conf-session/upstart-dbus-session-bridge.conf \ conf-session/upstart-dbus-system-bridge.conf @@ -33,7 +34,6 @@ dist_init_DATA = \ conf/upstart-socket-bridge.conf \ - conf/upstart-event-bridge.conf \ conf/upstart-file-bridge.conf \ conf/upstart-dbus-bridge.conf @@ -106,8 +106,9 @@ upstart_local_bridge_SOURCES = \ upstart-local-bridge.c nodist_upstart_local_bridge_SOURCES = \ + $(org_freedesktop_systemd1_OUTPUTS) \ $(com_ubuntu_Upstart_OUTPUTS) \ - $(com_ubuntu_Upstart_Job_OUTPUTS) + $(control_com_ubuntu_Upstart_OUTPUTS) upstart_local_bridge_LDADD = \ $(LTLIBINTL) \ $(NIH_LIBS) \ @@ -224,15 +225,50 @@ --output=$@ $< +org_freedesktop_systemd1_OUTPUTS = \ + org.freedesktop.systemd1.c \ + org.freedesktop.systemd1.h + +org_freedesktop_systemd1_XML = \ + org.freedesktop.systemd1.xml + +$(org_freedesktop_systemd1_OUTPUTS): $(org_freedesktop_systemd1_XML) + $(AM_V_GEN)$(NIH_DBUS_TOOL) \ + --package=$(PACKAGE) \ + --mode=proxy --prefix=systemd \ + --default-interface=org.freedesktop.systemd1.Manager \ + --output=$@ $< + +# Server for upstart-local-bridge +control_com_ubuntu_Upstart_OUTPUTS = \ + control_com.ubuntu.Upstart.c \ + control_com.ubuntu.Upstart.h + +control_com_ubuntu_Upstart_XML = \ + com.ubuntu.Upstart.xml + +$(control_com_ubuntu_Upstart_OUTPUTS): $(control_com_ubuntu_Upstart_XML) + $(AM_V_GEN)$(NIH_DBUS_TOOL) \ + --package=$(PACKAGE) \ + --mode=object --prefix=control \ + --default-interface=com.ubuntu.Upstart0_6 \ + --output=$@ $< + + + # These have to be built sources because we can't compile object files # without the header file existing first BUILT_SOURCES = \ $(com_ubuntu_Upstart_OUTPUTS) \ - $(com_ubuntu_Upstart_Job_OUTPUTS) + $(control_com_ubuntu_Upstart_OUTPUTS) \ + $(com_ubuntu_Upstart_Job_OUTPUTS) \ + $(org_freedesktop_systemd1_OUTPUTS) CLEANFILES = \ $(com_ubuntu_Upstart_OUTPUTS) \ - $(com_ubuntu_Upstart_Job_OUTPUTS) + $(control_com_ubuntu_Upstart_OUTPUTS) \ + $(com_ubuntu_Upstart_Job_OUTPUTS) \ + $(org_freedesktop_systemd1_OUTPUTS) clean-local: --- upstart-1.13.2.orig/extra/com.ubuntu.Upstart.xml +++ upstart-1.13.2/extra/com.ubuntu.Upstart.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + --- upstart-1.13.2.orig/extra/conf-session/upstart-event-bridge.conf +++ upstart-1.13.2/extra/conf-session/upstart-event-bridge.conf @@ -12,4 +12,8 @@ respawn +pre-start script + test -d /run/systemd/system && { stop; exit 0; } +end script + exec upstart-event-bridge --- upstart-1.13.2.orig/extra/conf-session/upstart-udev-bridge.conf +++ upstart-1.13.2/extra/conf-session/upstart-udev-bridge.conf @@ -0,0 +1,22 @@ +# upstart-udev-bridge - Bridge udev events into session upstart +# +# This helper daemon receives udev events from the netlink socket and +# emits equivalent Upstart events. + +description "Bridge udev events into upstart" + +# From upstart-udev-bridge itself +emits *-device-added +emits *-device-removed +emits *-device-changed +# From http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev-device.html +emits *-device-online +emits *-device-offline + +start on startup +stop on desktop-end + +expect daemon +respawn + +exec upstart-udev-bridge --daemon --user --- upstart-1.13.2.orig/extra/org.freedesktop.systemd1.xml +++ upstart-1.13.2/extra/org.freedesktop.systemd1.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + --- upstart-1.13.2.orig/extra/upstart-event-bridge.c +++ upstart-1.13.2/extra/upstart-event-bridge.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include #include #include @@ -42,8 +45,10 @@ #include "dbus/upstart.h" #include "com.ubuntu.Upstart.h" +#define DBUS_ADDRESS_LOCAL "unix:abstract=/com/ubuntu/upstart/local/bridge" /* Prototypes for static functions */ +static int systemd_booted (void); static void upstart_disconnected (DBusConnection *connection); static void upstart_forward_event (void *data, NihDBusMessage *message, const char *path); @@ -60,6 +65,14 @@ static int daemonise = FALSE; /** + * local: + * + * Set to TRUE if we should connect to upstart-local-bridge instead of + * the system init. + **/ +static int local = FALSE; + +/** * system_upstart: * * Proxy to system Upstart daemon. @@ -119,9 +132,14 @@ exit (1); } - /* Initialise the connection to system Upstart */ - system_connection = NIH_SHOULD (nih_dbus_bus (DBUS_BUS_SYSTEM, upstart_disconnected)); + local = systemd_booted (); + /* Initialise the connection to system Upstart */ + if (local) { + system_connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_LOCAL, upstart_disconnected)); + } else { + system_connection = NIH_SHOULD (nih_dbus_bus (DBUS_BUS_SYSTEM, upstart_disconnected)); + } if (! system_connection) { NihError *err; @@ -134,7 +152,7 @@ } system_upstart = NIH_SHOULD (nih_dbus_proxy_new (NULL, system_connection, - DBUS_SERVICE_UPSTART, DBUS_PATH_UPSTART, + NULL, DBUS_PATH_UPSTART, NULL, NULL)); if (! system_upstart) { NihError *err; @@ -259,6 +277,20 @@ return ret; } +static int +systemd_booted (void) +{ + struct stat st; + + if (lstat ("/run/systemd/system/", &st) == 0) { + if (S_ISDIR(st.st_mode)) { + return TRUE; + } + } + + return FALSE; +} + static void upstart_disconnected (DBusConnection *connection) { @@ -293,7 +325,11 @@ nih_assert (event_name != NULL); /* Build the new event name */ - NIH_MUST (nih_strcat_sprintf (&new_event_name, NULL, ":sys:%s", event_name)); + if (local) { + new_event_name = NIH_MUST (nih_strdup (NULL, event_name)); + } else { + new_event_name = NIH_MUST (nih_sprintf (NULL, ":sys:%s", event_name)); + } /* Re-transmit the event */ pending_call = upstart_emit_event (user_upstart, --- upstart-1.13.2.orig/extra/upstart-local-bridge.c +++ upstart-1.13.2/extra/upstart-local-bridge.c @@ -22,10 +22,14 @@ #endif /* HAVE_CONFIG_H */ #include +#include #include #include +#include +#include #include +#include #include #include #include @@ -45,24 +49,17 @@ #include #include +#include #include "dbus/upstart.h" #include "com.ubuntu.Upstart.h" -#include "com.ubuntu.Upstart.Job.h" +#include "org.freedesktop.systemd1.h" +#include "control_com.ubuntu.Upstart.h" -/** - * Job: - * - * @entry: list header, - * @path: D-Bus path for a job. - * - * Representation of an Upstart Job. - * - **/ -typedef struct job { - NihList entry; - char *path; -} Job; +#define DBUS_ADDRESS_SYSTEMD "unix:path=/run/systemd/private" +#define DBUS_PATH_SYSTEMD "/org/freedesktop/systemd1" +#define DBUS_SERVICE_SYSTEMD "org.freedesktop.systemd1" +#define DBUS_ADDRESS_LOCAL "unix:abstract=/com/ubuntu/upstart/local/bridge" /** * Socket: @@ -100,12 +97,14 @@ struct ucred ucred; } ClientConnection; -static void upstart_job_added (void *data, NihDBusMessage *message, - const char *job); -static void upstart_job_removed (void *data, NihDBusMessage *message, - const char *job); static void upstart_connect (void); -static void upstart_disconnected (DBusConnection *connection); +static void systemd_connect (void); +static int systemd_booted (void); +static int control_server_open (void); +static int control_server_connect (DBusServer *server, + DBusConnection *conn); +static void control_disconnected (DBusConnection *conn); +static void init_disconnected (DBusConnection *connection); static Socket *create_socket (void *parent); @@ -121,6 +120,8 @@ static void emit_event (ClientConnection *client, const char *pair, size_t len); +static void process_event (ClientConnection *client, const char *pair, size_t len); + static void signal_handler (void *data, NihSignal *signal); static void cleanup (void); @@ -134,23 +135,39 @@ static int daemonise = FALSE; /** - * jobs: + * upstart: * - * Jobs that we're monitoring. + * Proxy to Upstart daemon. **/ -static NihHash *jobs = NULL; +static NihDBusProxy *upstart = NULL; /** - * upstart: + * systemd: * - * Proxy to Upstart daemon. + * Proxy to systemd daemon. **/ -static NihDBusProxy *upstart = NULL; +static NihDBusProxy *systemd = NULL; + +/** + * control_server + * + * D-Bus server listening for new direct connections. + **/ +DBusServer *control_server = NULL; + +/** + * control_conns: + * + * Open control connections, including the connection to a D-Bus + * bus and any private client connections. + **/ +NihList *control_conns = NULL; /** * event_name: * - * Name of event this bridge emits. + * upstart: Name of event this bridge emits. + * systmed: Name of target this generator creates. **/ static char *event_name = NULL; @@ -202,7 +219,7 @@ { 0, "daemon", N_("Detach and run in the background"), NULL, NULL, &daemonise, NULL }, - { 0, "event", N_("specify name of event to emit on receipt of name=value pair"), + { 0, "event", N_("specify name of event to emit / target to generate on receipt of name=value pair"), NULL, "EVENT", &event_name, NULL }, { 0, "any-user", N_("allow any user to connect"), @@ -258,7 +275,7 @@ nih_main_init (argv[0]); - nih_option_set_synopsis (_("Local socket Upstart Bridge")); + nih_option_set_synopsis (_("Local socket Upstart Bridge & systemd generator")); nih_option_set_help ( _("By default, this bridge does not detach from the " "console and remains in the foreground. Use the --daemon " @@ -273,9 +290,6 @@ exit (1); } - /* Allocate jobs hash table */ - jobs = NIH_MUST (nih_hash_string_new (NULL, 0)); - sock = create_socket (NULL); if (! sock) { nih_fatal ("%s %s", @@ -286,7 +300,26 @@ nih_debug ("Connected to socket '%s' on fd %d", socket_name, sock->sock); - upstart_connect (); + if (systemd_booted() == TRUE) { + systemd_connect (); + } else { + upstart_connect (); + } + + control_conns = NIH_MUST (nih_list_new (NULL)); + + while ((ret = control_server_open ()) < 0) { + NihError *err; + + err = nih_error_get (); + if (err->number != ENOMEM) { + nih_warn ("%s: %s", _("Unable to listen for private" + "connections"), err->message); + nih_free (err); + break; + } + nih_free (err); + } /* Become daemon */ if (daemonise) { @@ -326,103 +359,14 @@ return ret; } -static void -upstart_job_added (void *data, - NihDBusMessage *message, - const char *job_class_path) -{ - nih_local NihDBusProxy *job_class = NULL; - nih_local char ***start_on = NULL; - nih_local char ***stop_on = NULL; - Job *job; - - nih_assert (job_class_path != NULL); - - /* Obtain a proxy to the job */ - job_class = nih_dbus_proxy_new (NULL, upstart->connection, - upstart->name, job_class_path, - NULL, NULL); - if (! job_class) { - NihError *err; - - err = nih_error_get (); - nih_error ("Could not create proxy for job %s: %s", - job_class_path, err->message); - nih_free (err); - - return; - } - - job_class->auto_start = FALSE; - - /* Obtain the start_on and stop_on properties of the job */ - if (job_class_get_start_on_sync (NULL, job_class, &start_on) < 0) { - NihError *err; - - err = nih_error_get (); - nih_error ("Could not obtain job start condition %s: %s", - job_class_path, err->message); - nih_free (err); - - return; - } - - if (job_class_get_stop_on_sync (NULL, job_class, &stop_on) < 0) { - NihError *err; - - err = nih_error_get (); - nih_error ("Could not obtain job stop condition %s: %s", - job_class_path, err->message); - nih_free (err); - - return; - } - - /* Free any existing record for the job (should never happen, - * but worth being safe). - */ - job = (Job *)nih_hash_lookup (jobs, job_class_path); - if (job) - nih_free (job); - - /* Create new record for the job */ - job = NIH_MUST (nih_new (NULL, Job)); - job->path = NIH_MUST (nih_strdup (job, job_class_path)); - - nih_list_init (&job->entry); - - nih_debug ("Job got added %s", job_class_path); - - nih_alloc_set_destructor (job, nih_list_destroy); - - /* Add all jobs */ - nih_hash_add (jobs, &job->entry); -} - -static void -upstart_job_removed (void *data, - NihDBusMessage *message, - const char *job_path) -{ - Job *job; - - nih_assert (job_path != NULL); - - job = (Job *)nih_hash_lookup (jobs, job_path); - if (job) { - nih_debug ("Job went away %s", job_path); - nih_free (job); - } -} static void upstart_connect (void) { DBusConnection *connection; - char **job_class_paths; /* Initialise the connection to Upstart */ - connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected)); + connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, init_disconnected)); if (! connection) { NihError *err; @@ -449,59 +393,169 @@ } nih_debug ("Connected to Upstart"); +} - /* Connect signals to be notified when jobs come and go */ - if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobAdded", - (NihDBusSignalHandler)upstart_job_added, NULL)) { +static void +systemd_connect (void) +{ + DBusConnection *connection; + + /* Initialise the connection to systemd */ + /* /run/systemd/private is supposedly "private" end-point + * which systemctl & libsystemd use */ + connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_SYSTEMD, init_disconnected)); + if (! connection) { NihError *err; err = nih_error_get (); - nih_fatal ("%s: %s", _("Could not create JobAdded signal connection"), + nih_fatal ("%s: %s", _("Could not connect to systemd"), err->message); nih_free (err); exit (1); } - if (! nih_dbus_proxy_connect (upstart, &upstart_com_ubuntu_Upstart0_6, "JobRemoved", - (NihDBusSignalHandler)upstart_job_removed, NULL)) { + systemd = NIH_SHOULD (nih_dbus_proxy_new (NULL, connection, + NULL, DBUS_PATH_SYSTEMD, + NULL, NULL)); + if (! systemd) { NihError *err; err = nih_error_get (); - nih_fatal ("%s: %s", _("Could not create JobRemoved signal connection"), + nih_fatal ("%s: %s", _("Could not create systemd proxy"), err->message); nih_free (err); exit (1); } - /* Request a list of all current jobs */ - if (upstart_get_all_jobs_sync (NULL, upstart, &job_class_paths) < 0) { - NihError *err; - - err = nih_error_get (); - nih_fatal ("%s: %s", _("Could not obtain job list"), - err->message); - nih_free (err); - + FILE *fp = NULL; + nih_local char *template_name = NULL; + + template_name = NIH_MUST (nih_sprintf (NULL, "/run/systemd/system/%s@.target", event_name)); + + fp = NIH_SHOULD (fopen(template_name, "we")); + if (!fp) { + nih_fatal ("%s %s", _("Failed to create target template"), + strerror (errno)); exit (1); } + fprintf (fp, + "# Automatically generated by %s\n\n" + "[Unit]\n" + "Description=Local bridge key value pairs\n" + "Documentation=man:%s\n", + program_name, program_name); + fflush (fp); + if (ferror (fp)) { + nih_fatal ("%s %s", _("Failed to write target template"), + strerror (errno)); + exit (1); + } + fclose (fp); - for (char **job_class_path = job_class_paths; - job_class_path && *job_class_path; job_class_path++) - upstart_job_added (NULL, NULL, *job_class_path); + nih_debug ("Connected to systemd"); +} + +static int +systemd_booted (void) +{ + struct stat st; - nih_free (job_class_paths); + if (lstat ("/run/systemd/system/", &st) == 0) { + if (S_ISDIR(st.st_mode)) { + return TRUE; + } + } + + return FALSE; } static void -upstart_disconnected (DBusConnection *connection) +init_disconnected (DBusConnection *connection) { - nih_fatal (_("Disconnected from Upstart")); + nih_fatal (_("Disconnected from init")); nih_main_loop_exit (1); } /** + * control_server_open: + * + * Open a listening D-Bus server and store it in the control_server global. + * New connections are permitted from the root user, and handled + * automatically in the main loop. + * + * Returns: zero on success, negative value on raised error. + **/ + +int +control_server_open (void) +{ + nih_assert (control_server == NULL); + + control_server = nih_dbus_server (DBUS_ADDRESS_LOCAL, + control_server_connect, + control_disconnected); + if (! control_server) + return -1; + + nih_debug("D-Bus server started at address: %s", DBUS_ADDRESS_LOCAL); + + return 0; +} + +/** + * control_server_connect: + * + * Called when a new client connects to our server and is used to register + * objects on the new connection. + * + * Returns: always TRUE. + **/ +static int +control_server_connect (DBusServer *server, + DBusConnection *conn) +{ + nih_assert (server != NULL); + nih_assert (server == control_server); + nih_assert (conn != NULL); + NihListEntry *entry = NULL; + + /* Register objects on the connection. */ + NIH_MUST (nih_dbus_object_new (NULL, conn, DBUS_PATH_UPSTART, + control_interfaces, NULL)); + + + entry = NIH_MUST (nih_list_entry_new (NULL)); + entry->data = conn; + nih_list_add (control_conns, &entry->entry); + nih_debug("Connection from private client"); + + return TRUE; +} + +/** + * control_disconnected: + * + * This function is called when the connection to the D-Bus system bus, + * or a client connection to our D-Bus server, is dropped and our reference + * is about to be list. We clear the connection from our current list + * and drop the control_bus global if relevant. + **/ +static void +control_disconnected (DBusConnection *conn) +{ + nih_assert (conn != NULL); + /* Remove from the connections list */ + NIH_LIST_FOREACH_SAFE (control_conns, iter) { + NihListEntry *entry = (NihListEntry *)iter; + + if (entry->data == conn) + nih_free (entry); + } +} + +/** * socket_watcher: * * @sock: Socket, @@ -645,7 +699,7 @@ if (used_len < min_len) continue; - emit_event (client, pair, used_len); + process_event (client, pair, used_len); } /* Consume the entire length */ @@ -724,6 +778,8 @@ /* Handle abstract names */ if (sock->sun_addr.sun_path[0] == '@') sock->sun_addr.sun_path[0] = '\0'; + else + (void) unlink(sock->sun_addr.sun_path); sock->sock = socket (sock->addr.sa_family, SOCK_STREAM, 0); if (sock->sock < 0) { @@ -830,17 +886,102 @@ /* Add the name=value pair */ NIH_MUST (nih_str_array_addn (&env, NULL, NULL, pair, len)); - pending_call = upstart_emit_event (upstart, - event_name, env, FALSE, - NULL, emit_event_error, NULL, - NIH_DBUS_TIMEOUT_NEVER); + if (upstart) { + pending_call = upstart_emit_event (upstart, + event_name, env, FALSE, + NULL, emit_event_error, NULL, + NIH_DBUS_TIMEOUT_NEVER); + + if (! pending_call) { + NihError *err; + err = nih_error_get (); + nih_warn ("%s", err->message); + nih_free (err); + } + + dbus_pending_call_unref (pending_call); + } + + NIH_LIST_FOREACH (control_conns, iter) { + NihListEntry *entry = (NihListEntry *)iter; + DBusConnection *conn = (DBusConnection *)entry->data; + + NIH_ZERO (control_emit_event_emitted (conn, DBUS_PATH_UPSTART, + event_name, env)); + } - if (! pending_call) { +} + +static void +systemd_launch_instance (ClientConnection *client, + const char *pair, + size_t len) +{ + nih_local char *safe_pair = NULL; + nih_local char **key_value = NULL; + nih_local char *group_name = NULL; + nih_local char *unit_name = NULL; + nih_local char *job_name = NULL; + + nih_assert (client); + nih_assert (pair); + nih_assert (len); + + /* Why is pair not null-terminated?! */ + safe_pair = NIH_MUST (nih_strndup (NULL, pair, len)); + + /* Get key val from the key=val pair */ + key_value = NIH_MUST (nih_str_split (NULL, safe_pair, "=", TRUE)); + + /* Construct systemd event@key=*.target group name */ + group_name = NIH_MUST (nih_sprintf (NULL, "%s@%s=*.target", + event_name, key_value[0])); + + /* Construct systemd event@key=value.target unit name */ + unit_name = NIH_MUST (nih_sprintf (NULL, "%s@%s\\x3d%s.target", + event_name, key_value[0], + key_value[1])); + + /* Stop group */ + int pid = -1; + siginfo_t info; + do { + pid = fork (); + } while (pid < 0); + + if (pid) { + info.si_code = 0; + info.si_status = 0; + if (waitid (P_PID, pid, &info, WEXITED)) { + nih_fatal ("%s %s", _("Failed to wait for systemctl"), + strerror (errno)); + } + if (info.si_code != CLD_EXITED || info.si_status) { + nih_fatal ("Bad systemctl exit code %i and status %i\n", info.si_code, info.si_status); + } + } else { + /* Create and submit stop state transition, do not wait to complete */ + execlp ("systemctl", "systemctl", "--no-block", "stop", group_name, (char *)NULL); + } + + /* Create and submit start state transition, do not wait to complete */ + if (systemd_start_unit_sync (NULL, systemd, unit_name, "replace", &job_name)) { NihError *err; err = nih_error_get (); nih_warn ("%s", err->message); nih_free (err); } +} + - dbus_pending_call_unref (pending_call); +static void +process_event (ClientConnection *client, + const char *pair, + size_t len) +{ + emit_event (client, pair, len); + + if (systemd) { + systemd_launch_instance (client, pair, len); + } } --- upstart-1.13.2.orig/extra/upstart-udev-bridge.c +++ upstart-1.13.2/extra/upstart-udev-bridge.c @@ -69,6 +69,15 @@ static NihDBusProxy *upstart = NULL; /** + * user: + * + * If TRUE, run in User Session mode connecting to the Session Init + * rather than PID 1. In this mode, certain relative paths are also + * expanded. + **/ +static int user = FALSE; + +/** * no_strip_udev_data: * * If TRUE, do not modify any udev message data (old behaviour). @@ -86,6 +95,8 @@ NULL, NULL, &daemonise, NULL }, { 0, "no-strip", N_("Do not strip non-printable bytes from udev message data"), NULL, NULL, &no_strip_udev_data, NULL }, + { 0, "user", N_("Connect to user session"), + NULL, NULL, &user, NULL }, NIH_OPTION_LAST }; @@ -97,6 +108,11 @@ { char ** args; DBusConnection * connection; + char * pidfile_path = NULL; + char * pidfile = NULL; + char *user_session_addr = NULL; + nih_local char ** user_session_path = NULL; + char * path_element = NULL; struct udev * udev; struct udev_monitor *udev_monitor; int ret; @@ -113,8 +129,19 @@ if (! args) exit (1); + if (user) { + user_session_addr = getenv ("UPSTART_SESSION"); + if (! user_session_addr) { + nih_fatal (_("UPSTART_SESSION isn't set in environment")); + exit (EXIT_FAILURE); + } + } + /* Initialise the connection to Upstart */ - connection = NIH_SHOULD (nih_dbus_connect (DBUS_ADDRESS_UPSTART, upstart_disconnected)); + connection = NIH_SHOULD (nih_dbus_connect (user + ? user_session_addr + : DBUS_ADDRESS_UPSTART, + upstart_disconnected)); if (! connection) { NihError *err; @@ -153,6 +180,35 @@ /* Become daemon */ if (daemonise) { + /* Deal with the pidfile location when becoming a daemon. + * We need to be able to run one bridge per upstart daemon. + * Store the PID file in XDG_RUNTIME_DIR or HOME and include the pid of + * the Upstart instance (last part of the DBus path) in the filename. + */ + + if (user) { + /* Extract PID from UPSTART_SESSION */ + user_session_path = nih_str_split (NULL, user_session_addr, "/", TRUE); + + for (int i = 0; user_session_path && user_session_path[i]; i++) + path_element = user_session_path[i]; + + if (! path_element) { + nih_fatal (_("Invalid value for UPSTART_SESSION")); + exit (1); + } + + pidfile_path = getenv ("XDG_RUNTIME_DIR"); + if (!pidfile_path) + pidfile_path = getenv ("HOME"); + + if (pidfile_path) { + NIH_MUST (nih_strcat_sprintf (&pidfile, NULL, "%s/%s.%s.pid", + pidfile_path, program_invocation_short_name, path_element)); + nih_main_set_pidfile (pidfile); + } + } + if (nih_main_daemonise () < 0) { NihError *err; @@ -163,10 +219,12 @@ exit (1); } - - /* Send all logging output to syslog */ - openlog (program_name, LOG_PID, LOG_DAEMON); - nih_log_set_logger (nih_logger_syslog); + + if (!user) { + /* Send all logging output to syslog for system bridge */ + openlog (program_name, LOG_PID, LOG_DAEMON); + nih_log_set_logger (nih_logger_syslog); + } } /* Handle TERM and INT signals gracefully */ --- upstart-1.13.2.orig/init/Makefile.am +++ upstart-1.13.2/init/Makefile.am @@ -8,6 +8,7 @@ $(NIH_CFLAGS) \ $(NIH_DBUS_CFLAGS) \ $(DBUS_CFLAGS) \ + $(SELINUX_CFLAGS) \ $(JSON_CFLAGS) \ $(CGMANAGER_CFLAGS) AM_LIBADD = $(CGMANAGER_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS) @@ -64,6 +65,7 @@ errors.h \ apparmor.c apparmor.h nodist_init_SOURCES = \ + $(org_freedesktop_DBus_OUTPUTS) \ $(com_ubuntu_Upstart_OUTPUTS) \ $(com_ubuntu_Upstart_Job_OUTPUTS) \ $(com_ubuntu_Upstart_Instance_OUTPUTS) @@ -73,6 +75,7 @@ $(NIH_LIBS) \ $(NIH_DBUS_LIBS) \ $(DBUS_LIBS) \ + $(SELINUX_LIBS) \ $(JSON_LIBS) \ $(CGMANAGER_LIBS) \ -lrt @@ -125,14 +128,30 @@ --default-interface=com.ubuntu.Upstart0_6.Instance \ --output=$@ $< +org_freedesktop_DBus_OUTPUTS = \ + org.freedesktop.DBus.c \ + org.freedesktop.DBus.h + +org_freedesktop_DBus_XML = \ + ../dbus/org.freedesktop.DBus.xml + +$(org_freedesktop_DBus_OUTPUTS): $(org_freedesktop_DBus_XML) + $(AM_V_GEN)$(NIH_DBUS_TOOL) \ + --package=$(PACKAGE) \ + --mode=proxy --prefix=control_dbus \ + --default-interface=org.freedesktop.DBus \ + --output=$@ $< + # These have to be built sources because we can't compile object files # without the header file existing first BUILT_SOURCES = \ + $(org_freedesktop_DBus_OUTPUTS) \ $(com_ubuntu_Upstart_OUTPUTS) \ $(com_ubuntu_Upstart_Job_OUTPUTS) \ $(com_ubuntu_Upstart_Instance_OUTPUTS) CLEANFILES = \ + $(org_freedesktop_DBus_OUTPUTS) \ $(com_ubuntu_Upstart_OUTPUTS) \ $(com_ubuntu_Upstart_Job_OUTPUTS) \ $(com_ubuntu_Upstart_Instance_OUTPUTS) @@ -204,6 +223,7 @@ test_conf_preload.sh$(EXEEXT): tests/test_conf_preload.sh.in Makefile test_conf sed -e 's|[@]abs_builddir[@]|$(abs_builddir)|g' \ + -e 's|[@]top_builddir[@]|$(top_builddir)|g' \ -e 's|[@]inotify_preload_library[@]|$(check_LTLIBRARIES)|g' \ $< > $@ chmod +x $@ @@ -231,6 +251,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -249,6 +270,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(NIH_LIBS) \ @@ -266,6 +288,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -284,6 +307,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -302,6 +326,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -320,6 +345,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -338,6 +364,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(NIH_LIBS) \ @@ -355,6 +382,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -373,6 +401,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(NIH_LIBS) \ @@ -390,6 +419,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -408,6 +438,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(NIH_LIBS) \ @@ -430,6 +461,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -448,6 +480,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(NIH_LIBS) \ @@ -479,6 +512,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o cgroup.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ @@ -495,6 +529,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(NIH_LIBS) \ @@ -512,6 +547,7 @@ job_class.o job_process.o job.o event.o event_operator.o blocked.o \ parse_job.o parse_conf.o conf.o control.o quiesce.o \ session.o log.o state.o xdg.o apparmor.o \ + org.freedesktop.DBus.o \ com.ubuntu.Upstart.o \ com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ $(top_builddir)/test/libtest_util_common.a \ --- upstart-1.13.2.orig/init/apparmor.c +++ upstart-1.13.2/init/apparmor.c @@ -111,6 +111,18 @@ return FALSE; } + /* Do not load if running in a container. + * This is a distro-specific patch. + */ + if (stat ("/run/container_type", &statbuf) == 0) + return FALSE; + + /* Do not load if running in a Ubuntu live CD. + * This is a distro-specific patch. + */ + if (stat ("/rofs/etc/apparmor.d", &statbuf) == 0) + return FALSE; + return TRUE; } --- upstart-1.13.2.orig/init/control.c +++ upstart-1.13.2/init/control.c @@ -62,6 +62,7 @@ #include "xdg.h" #include "com.ubuntu.Upstart.h" +#include "org.freedesktop.DBus.h" #ifdef ENABLE_CGROUPS #include "cgroup.h" @@ -1421,8 +1422,47 @@ nih_assert (job->env); NIH_MUST (environ_add (&job->env, job, NULL, replace, envvar)); - } else if (job_class_environment_set (envvar, replace) < 0) { - nih_return_no_memory_error (-1); + } else { + if (job_class_environment_set (envvar, replace) < 0) { + nih_return_no_memory_error (-1); + } + if (job_name == NULL && user_mode && control_bus ) { + ControlDbusUpdateActivationEnvironmentVarsElement **dbus_vars = NULL; + NihDBusProxy *dbus_proxy = NULL; + char ** split_vars = NULL; + dbus_vars = NIH_MUST (nih_alloc (NULL, sizeof (ControlDbusUpdateActivationEnvironmentVarsElement *) * 2)); + dbus_vars[0] = NIH_MUST (nih_new (dbus_vars, ControlDbusUpdateActivationEnvironmentVarsElement)); + dbus_vars[1] = NULL; + split_vars = NIH_MUST (nih_str_split (dbus_vars[0], envvar, "=", FALSE)); + if (*split_vars && *split_vars[0]) { + dbus_vars[0]->item0 = *split_vars; + } else { + dbus_vars[0]->item0 = nih_strdup (dbus_vars[0], ""); + } + if (*(split_vars+1) && *(split_vars+1)[0]) { + dbus_vars[0]->item1 = *(split_vars+1); + } else { + dbus_vars[0]->item1 = nih_strdup (dbus_vars[0], ""); + } + + dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus, + "org.freedesktop.DBus", "/org/freedesktop/DBus", NULL, NULL)); + + if (! dbus_proxy) { + nih_warn (_("Failed to get dbus_proxy")); + } else { + if (control_dbus_update_activation_environment_sync (dbus_vars, dbus_proxy, dbus_vars) != 0) { + NihDBusError *dbus_err; + dbus_err = (NihDBusError *)nih_error_get (); + nih_error ("%s", dbus_err->message); + nih_free (dbus_err); + nih_warn ("dbus_vars[0] item0: %s", dbus_vars[0]->item0); + nih_warn ("dbus_vars[0] item1: %s", dbus_vars[0]->item1); + nih_warn (_("Failed to update DBus activation environment")); + } + } + nih_free(dbus_vars); + } } } --- upstart-1.13.2.orig/init/job_process.c +++ upstart-1.13.2/init/job_process.c @@ -2,7 +2,7 @@ * * job_process.c - job process handling * - * Copyright © 2011 Canonical Ltd. + * Copyright 2011 Canonical Ltd. * Author: Scott James Remnant . * * This program is free software; you can redistribute it and/or modify @@ -1766,10 +1766,18 @@ /* We should always fail the job if the security profile * failed to load */ + + /* Disabled for now to emulate current Ubuntu behaviour + * in /lib/init/apparmor-profile-load to work around bug + * LP: #1058356 + if (status) { failed = TRUE; stop = TRUE; } + + */ + break; case PROCESS_PRE_START: nih_assert (job->state == JOB_PRE_START); --- upstart-1.13.2.orig/init/log.c +++ upstart-1.13.2/init/log.c @@ -42,7 +42,7 @@ * * TRUE if log_clear_unflushed() has been called successfully. **/ -static int log_flushed = 0; +int log_flushed = 0; /** * log_unflushed_files: @@ -758,23 +758,23 @@ log_unflushed_init (); - /* re-parent */ - nih_ref (log, log_unflushed_files); - nih_unref (log, parent); - - elem = nih_list_entry_new (log); + elem = nih_list_entry_new (log_unflushed_files); if (! elem) { /* If memory is low, we discard the unflushed * data buffer too. */ - nih_unref (log, log_unflushed_files); + nih_unref (log, parent); return -1; } + /* re-parent */ + nih_ref (log, elem); + nih_unref (log, parent); + /* Indicate separation from parent */ log->detached = 1; - elem->data = log; + elem->data = log; nih_list_add_after (log_unflushed_files, &elem->entry); return 0; @@ -800,6 +800,50 @@ elem = (NihListEntry *)iter; log = elem->data; + nih_assert (log); + + if (! log->unflushed->len) { + /* The job that originally owned this log has + * exited, but it spawned one or more other + * processes which still live on. If those + * processes produce output, the NihIo will get + * called automatically to flush the data. + * However, that happens asynchronously to + * clearing the unflushed list. + * + * Hence, if no unflushed data remains, remove + * the entry from the list. + * + * Note that doing so frees the log and stops + * any further output being logged from the + * out-of-job process(es). This isn't ideal + * however: + * + * - Better this than having the Log objects remain indefinitely. + * + * - The problem is ultimately caused by a rogue + * job which should be fixed (see the warning + * that is produced for such jobs in + * log_read_watch()). + * + * - Even if the Log was retained, it would not + * be flushed unless multiple calls to this + * function are made (which is not going to + * occur by default). + * + * Note that it is necessary to set the io to + * NULL since it has already been freed by + * nih_io_closed(), but the io is not set to + * NULL. If we don't do this, when log_destroy() + * is called, it will attempt to dereference the + * already freed log->io. + */ + log->io = NULL; + nih_free (elem); + + continue; + } + /* To be added to this list, log should have been * detached from its parent job. */ @@ -833,7 +877,7 @@ return -1; /* This will handle any remaining unflushed log data */ - nih_free (log); + nih_free (elem); } log_flushed = 1; --- upstart-1.13.2.orig/init/man/init.5 +++ upstart-1.13.2/init/man/init.5 @@ -1420,4 +1420,5 @@ .BR initctl (8), .BR prctl (2), .BR pty (7), -.BR sh (1). +.BR sh (1), +.BR upstart-events (7). --- upstart-1.13.2.orig/init/tests/test_conf_preload.sh.in +++ upstart-1.13.2/init/tests/test_conf_preload.sh.in @@ -33,6 +33,9 @@ build_dir="@abs_builddir@" test_path="$build_dir/$test_name" +libtool="@top_builddir@/libtool" + +[ -e "$libtool" ] || die "cannot find generated libtool binary" preload_library="$build_dir/@inotify_preload_library@" @@ -44,7 +47,7 @@ # Install the preload library to a temporary location since we need the # full path to the shared library for LD_PRELOAD. install_dir=$(mktemp -d --tmpdir="$builddir") -libtool --mode=install install \ +"$libtool" --mode=install install \ "$preload_library" "$install_dir" >/dev/null 2>&1 installed_lib=$(basename "$preload_library") @@ -60,5 +63,5 @@ LD_PRELOAD=$installed_so $test_path # clean up -libtool --mode=uninstall \ +"$libtool" --mode=uninstall \ rm "$install_dir/$installed_lib" >/dev/null 2>&1 --- upstart-1.13.2.orig/init/tests/test_job_process.c +++ upstart-1.13.2/init/tests/test_job_process.c @@ -1757,8 +1757,11 @@ TEST_EQ (kill (-job->pid[PROCESS_MAIN], SIGKILL), 0); waitpid (job->pid[PROCESS_MAIN], &status, 0); + /* FIXME: it is possible that a short lived process exits faster than + * we manage to kill it, and catch the signal; thus this test is racy. TEST_TRUE (WIFSIGNALED (status)); TEST_EQ (WTERMSIG (status), SIGKILL); + */ TEST_EQ (stat (filename, &statbuf), 0); @@ -2626,7 +2629,7 @@ CHECK_FILE_EQ (output, "0+0 records in\r\n", TRUE); CHECK_FILE_EQ (output, "0+0 records out\r\n", TRUE); - TEST_FILE_MATCH (output, "0 bytes (0 B) copied,*\r\n"); + TEST_FILE_MATCH (output, "0 bytes* copied,*\r\n"); TEST_FILE_END (output); fclose (output); @@ -3060,7 +3063,7 @@ TEST_EQ_STR (p, "7+0 records in\r\n"); CHECK_FILE_EQ (output, "7+0 records out\r\n", TRUE); - TEST_FILE_MATCH (output, "7 bytes (7 B) copied,*\r\n"); + TEST_FILE_MATCH (output, "7 bytes* copied,*\r\n"); TEST_FILE_END (output); fclose (output); @@ -8231,6 +8234,7 @@ class->expect = EXPECT_STOP; TEST_ALLOC_FAIL { + pid_t tmp_pid; TEST_ALLOC_SAFE { job = job_new (class, ""); @@ -8244,7 +8248,10 @@ exit (0); } - assert0 (waitid (P_PID, pid, &info, WSTOPPED | WNOWAIT)); + tmp_pid = waitid (P_PID, pid, &info, WSTOPPED | WNOWAIT); + if (tmp_pid < 0) + printf("waitid failed: %m"); + assert0 (tmp_pid); job->goal = JOB_START; job->state = JOB_SPAWNED; --- upstart-1.13.2.orig/init/tests/test_log.c +++ upstart-1.13.2/init/tests/test_log.c @@ -34,6 +34,8 @@ #include "job.h" #include "test_util_common.h" +extern int log_flushed; + /* * To help with understanding the TEST_ALLOC_FAIL peculiarities * below... @@ -652,6 +654,94 @@ TEST_FREE (log); /************************************************************/ + TEST_FEATURE ("ensure logger unflushed list ignores already flushed data"); + + /* Reset */ + log_flushed = 0; + + TEST_EQ (openpty (&pty_master, &pty_slave, NULL, NULL, NULL), 0); + + TEST_GT (sprintf (filename, "%s/test.log", dirname), 0); + + TEST_NE (log_unflushed_files, NULL); + TEST_TRUE (NIH_LIST_EMPTY (log_unflushed_files)); + + TEST_EQ (stat (dirname, &statbuf), 0); + + /* Save */ + old_perms = statbuf.st_mode; + + /* Make file inaccessible */ + TEST_EQ (chmod (dirname, 0x0), 0); + + log = log_new (NULL, filename, pty_master, 0); + TEST_NE_P (log, NULL); + + /* Write data to simulate a job process, but _DON'T_ close the + * fd (to simulate the job spawning another process which olds + * the fd open). + */ + ret = write (pty_slave, str, strlen (str)); + TEST_GT (ret, 0); + ret = write (pty_slave, "\n", 1); + TEST_EQ (ret, 1); + + assert0 (log->unflushed->len); + TEST_EQ_P (log->unflushed->buf, NULL); + + TEST_NE_P (log->io, NULL); + + TEST_WATCH_UPDATE (); + + /* nih_io_closed() should not have been called */ + TEST_NE_P (log->io, NULL); + + TEST_EQ_STR (log->unflushed->buf, "hello, world!\r\n"); + + /* +2 for '\r\n' */ + TEST_EQ (log->unflushed->len, 2 + strlen (str)); + + /* Ensure no log file written */ + TEST_LT (stat (filename, &statbuf), 0); + + TEST_TRUE (NIH_LIST_EMPTY (log_unflushed_files)); + + TEST_FREE_TAG (log); + + /* Force the usual code path for early boot on a normal system + * when a job produces output before the disks are writable. + */ + log->open_errno = EROFS; + + TEST_EQ (log_handle_unflushed (NULL, log), 0); + + TEST_FALSE (NIH_LIST_EMPTY (log_unflushed_files)); + + /* Restore access */ + TEST_EQ (chmod (dirname, old_perms), 0); + + TEST_NE_P (log->io, NULL); + + /* Simulate the data having already been flushed to disk + * and nih_io_closed() having been called. + */ + log->io = NULL; + log->unflushed->len = 0; + log->unflushed->buf = NULL; + log->remote_closed = 1; + + ret = log_clear_unflushed (); + TEST_EQ (ret, 0); + + TEST_FREE (log); + + /* Ensure no log file written */ + TEST_LT (stat (filename, &statbuf), 0); + + /* Tidy up */ + close (pty_slave); + + /************************************************************/ TEST_FEATURE ("ensure logger flushes when destroyed with uid 0"); TEST_EQ (openpty (&pty_master, &pty_slave, NULL, NULL, NULL), 0); @@ -1130,6 +1220,7 @@ test_log_destroy (void) { Log *log; + Log *tmp_log; int ret; int flags; char str[] = "hello, world!"; @@ -1138,6 +1229,9 @@ int found_fd; char filename[1024]; int fd; + NihListEntry *entry; + struct stat statbuf; + char *p; TEST_FUNCTION ("log_destroy"); @@ -1207,8 +1301,103 @@ TEST_FREE (log->unflushed); /************************************************************/ + TEST_FEATURE ("ensure unflushed data moved to unflushed list with uid 0"); + + TEST_TRUE (NIH_LIST_EMPTY (log_unflushed_files)); + + TEST_EQ (openpty (&pty_master, &pty_slave, NULL, NULL, NULL), 0); + + TEST_FILENAME (filename); + + /* Make file inaccessible to ensure data cannot be written + * and will thus be added to the unflushed buffer. + */ + fd = open (filename, O_CREAT | O_EXCL, 0); + TEST_NE (fd, -1); + close (fd); + + p = nih_strdup (NULL, "hello"); + TEST_NE_P (p, NULL); + + log = log_new (p, filename, pty_master, 0); + TEST_NE_P (log, NULL); + + TEST_ALLOC_PARENT (log, p); + + ret = write (pty_slave, str, strlen (str)); + TEST_GT (ret, 0); + + TEST_WATCH_UPDATE (); + close (pty_slave); + TEST_NE_P (log->unflushed, NULL); + TEST_EQ (log->unflushed->len, strlen(str)); + TEST_EQ_STR (log->unflushed->buf, str); + TEST_FREE_TAG (log); + + /* reset */ + log_flushed = 0; + + TEST_TRUE (NIH_LIST_EMPTY (log_unflushed_files)); + ret = log_handle_unflushed (p, log); + TEST_EQ (ret, 0); + + TEST_FALSE (NIH_LIST_EMPTY (log_unflushed_files)); + + TEST_ALLOC_NOT_PARENT (log, p); + + entry = (NihListEntry *)log_unflushed_files->next; + TEST_NE_P (entry, NULL); + TEST_FREE_TAG (entry); + TEST_ALLOC_PARENT (entry, log_unflushed_files); + + /* Free the original parent object and ensure it doesn't free + * the log. + */ + nih_free (p); + + TEST_FALSE (NIH_LIST_EMPTY (log_unflushed_files)); + TEST_NOT_FREE (log); + + tmp_log = entry->data; + TEST_EQ_P (tmp_log, log); + TEST_ALLOC_PARENT (log, entry); + + /* make file accessible again */ + assert0 (chmod (filename, 0755)); + + ret = log_clear_unflushed (); + assert0 (ret); + + TEST_FREE (entry); + TEST_FREE (log); + + assert0 (stat (filename, &statbuf)); + TEST_EQ (statbuf.st_size, strlen (str)); + + TEST_TRUE (NIH_LIST_EMPTY (log_unflushed_files)); + + /* full reset */ + log_flushed = 0; + nih_free (log_unflushed_files); + log_unflushed_files = NULL; + log_unflushed_init (); + + nih_free (nih_io_watches); + nih_io_watches = NULL; + nih_io_init (); + + assert0 (unlink (filename)); + + /************************************************************/ TEST_FEATURE ("ensure watch freed when log destroyed"); + /* Make file inaccessible to ensure data cannot be written + * and will thus be added to the unflushed buffer. + */ + fd = open (filename, O_CREAT | O_EXCL, 0); + TEST_NE (fd, -1); + close (fd); + TEST_EQ (openpty (&pty_master, &pty_slave, NULL, NULL, NULL), 0); log = log_new (NULL, filename, pty_master, 0); --- upstart-1.13.2.orig/scripts/init-checkconf.sh +++ upstart-1.13.2/scripts/init-checkconf.sh @@ -29,7 +29,7 @@ script_name=${0##*/} confdir=$(mktemp -d /tmp/${script_name}.XXXXXXXXXX) xdg_runtime_dir=$(mktemp -d /tmp/${script_name}.XXXXXXXXXX) -upstart_path=/sbin/init +upstart_path=/sbin/upstart initctl_path=/sbin/initctl debug_enabled=n file_valid=n --- upstart-1.13.2.orig/util/telinit.c +++ upstart-1.13.2/util/telinit.c @@ -160,27 +160,73 @@ int restart_upstart (void) { - nih_local NihDBusProxy *upstart = NULL; - DBusPendingCall *ret; + nih_local NihDBusProxy *upstart = NULL; + NihError *err; + int ret; upstart = upstart_open (NULL); if (! upstart) return -1; - /* Fire and forget: + /* Ask Upstart to restart itself. * - * Ask Upstart to restart itself using the async interface to - * avoid the client-side complaining if and when it detects that - * Upstart has severed all connections to perform the re-exec. + * Since it is not possible to serialise a D-Bus connection, + * Upstart is forced to sever all D-Bus client connections, + * including this one. + * + * Further, since the user expects telinit to block _until the + * re-exec has finished and Upstart is accepting connections + * once again_, the only solution is to wait for the forced + * disconnect, then poll until it is possible to create a new + * connection. + * + * Note that we don't (can't) care about the return code since + * it's not reliable: + * + * - either the re-exec request completed and D-Bus returned zero + * before Upstart started the re-exec. + * + * - or the re-exec request completed but upstart started the + * re-exec (severing all D-Bus connections) before D-Bus got a + * chance to finish cleanly meaning we receive a return of -1. + * + * We cannot know exactly what happened so have to allow for + * both scenarios. Note the implicit assumption that the re-exec + * request itself was accepted. If this assumption is incorrect + * (should not be possible), the worst case scenario is that + * upstart does not re-exec and then we quickly drop out of the + * reconnect block since it never went offline. */ - ret = upstart_restart (upstart, NULL, NULL, NULL, 0); - dbus_connection_flush(upstart->connection); + ret = upstart_restart_sync (NULL, upstart); + + if (ret < 0) { + err = nih_error_get (); + nih_free (err); + } - /* We don't care about the return code, but we have to keep - * the compiler happy. + nih_free (upstart); + + nih_debug ("Waiting for upstart to finish re-exec"); + + /* We believe Upstart is now in the process of + * re-exec'ing so attempt forever to reconnect. + * + * This sounds dangerous but there is no other option, + * and a connection must be possible unless the system + * is completely broken. */ - if (ret != (DBusPendingCall *)TRUE) - return 0; + while (TRUE) { + + upstart = upstart_open (NULL); + if (upstart) + break; + + err = nih_error_get (); + nih_free (err); + + /* Avoid DoS'ing the system whilst we wait */ + usleep (100000); + } return 0; }