Last commit made on 2011-01-22
Get this branch:
git clone -b ubuntu/maverick-updates https://git.launchpad.net/ubuntu/+source/upstart
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

db2a542... by Clint Byrum on 2010-12-29

Import patches-unapplied version 0.6.6-4 to ubuntu/maverick-proposed

Imported using git-ubuntu import.

Changelog parent: 175d7c403888023f4ac9c066bb8d5620f7576a92

New changelog entries:
  * 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.

175d7c4... by Scott James Remnant (Canonical) on 2010-08-12

Import patches-unapplied version 0.6.6-3 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 2f4566773e404c92bd075622a1445b55f4e09851

New changelog entries:
  * Ubuntu seems to have stopped installing Recommends of Build-Depends,
    add a Build-Depend on dbus. LP: #602130.
  * 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.
  * 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.
  * 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.
  * 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.
  * 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.
  * 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.
  * udev/upstart-udev-bridge.c: use right variable name, fixing a build
    failure. (LP: #524484)
  * udev/upstart-udev-bridge.c:
    - Increase receiving buffer size for uevents so we don't miss any.
      LP: #504883.
  * 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.
  * 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.
  * 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.
  * Retain the "telinit u" for the case when we're upgrading from pre-0.6
    (ie. hardy or jaunty). Whups. LP: #451556.
  * 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.
  * 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.
  * 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
  * 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.
  * Update autoconf and automake files. LP: #435252.
  [ 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.
  * debian/upstart-job:
    - force-reload should only send a HUP signal, since it may not be wise
      to actually restart (cf. dbus)
  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.
  * 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.
  * 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.
  * 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
  * Cherry-pick patch from -r1188 to fix "expect fork" and "expect daemon"
    LP: #264711.
  * Don't build the testsuite with -fPIE on armel; LP: #398403.
  * Add Conflicts on older Upstart packages to make update-manager's
    job easier.
  * Bump D-Bus build dependency to ensure we get the container abandonment
    patches, and the GIT version bump.
  * Actually ship /lib/init/upstart-job
  * 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.
  * 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.
  * 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.
  * Do not attempt to continue communicating with the restarted upstart
    (LP: #273761).
  * Implement "telinit u" by just sending Upstart SIGTERM with a slightly
    different patch than Fedora. LP: #188925.
  * Really fix LP: #237276 properly this time, lost the change while mucking
    around with bzr.
  * Correct build problem on amd64 and ia64 by only building libnih and
    libupstart statically. The shared objects were unwanted, and conflict
    with -fPIE.
  * Add missing limits.h, required to build with current libc.
  * Change dependency from sysvutils to sysvinit-utils. LP: #237276.
  * Compile with stack -fstack-protector, -fPIE, -z relro, -z now and -pie
    (MMmm, pie)
  * 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.
  * New upstream release:
    - many bug fixes.
  * Update reference to "edgy" in README.Debian to "hardy". LP: #140037.
  * 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
  * 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.
  * 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.
  * 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.
  * 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.
  * Don't abort the postinst if we can't send init SIGTERM. Ubuntu: #64499.
  * 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.
  * 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.
  * 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.
  * Set the runlevel to "S" when we enter sulogin so that it appears
    in utmp.

2f45667... by Scott James Remnant (Canonical) on 2011-04-28

Import patches-unapplied version 0.6.6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 18e0794d29bb1a6992655da984415ebc8cc33b30

New changelog entries:
  * New maintainer. Closes: #624440.

18e0794... by Michael Biebl on 2010-06-19

Import patches-unapplied version 0.6.6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5b189142e270ea6eb8a34ff8352bf4fba28484af

New changelog entries:
  * New upstream release.
    - Mount /proc and /sys on initialisation. Closes: #577710
    - Since version 0.6.5 upstart no longer includes a internal copy of libnih
      but instead depends on it being installed system wide.
    - Provide a separate function to reconnect to the D-Bus system bus which
      can be triggered by the SIGUSR1 signal as a config reload has the
      negative side effect of losing state.
  * debian/control
    - Add Build-Depends on libnih-dev (>= 1.0.2), libnih-dbus-dev (>= 1.0.2)
      and nih-dbus-tool.
    - Bump Standards-Version to 3.8.4. No further changes.
    - Add ${misc:Depends}.
  * debian/conf/dbus-reconnect.conf
    - Use SIGUSR1 to tell upstart to reconnect to the D-Bus system bus.
  * debian/upstart.docs
    - Remove ChangeLog.nih which is no longer included in the source.
  * debian/conf/tty*.conf
    - Run getty in 8-bit clean mode to better handle UTF-8 environments.
  * Switch to source format 3.0 (quilt).
    - Drop Build-Depends on quilt.
    - Remove quilt.make include and patch/unpatch targets from debian/rules.
    - Add debian/source/format.
  * Add SELinux support. Closes: #543420
    - Add debian/patches/01-selinux.patch to make upstart load the policy if
      SELinux is enabled. Patch by Russell Coker with some minor changes and
      build system integration.
    - Add debian/patches/99-autoreconf.patch.
    - Add Build-Depends on libselinux-dev.

5b18914... by Michael Biebl on 2009-08-05

Import patches-unapplied version 0.6.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5652c5ecbd48472b4afd3132a1c3f804b5c11615

New changelog entries:
  * New upstream release.
  * debian/patches/10-ptrace_include_cleanup.patch
    - Removed, merged upstream.

5652c5e... by Michael Biebl on 2009-07-28

Import patches-unapplied version 0.6.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7fc17040530c672949cd8224f4055983bda80beb

New changelog entries:
  * 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.

7fc1704... by Michael Biebl on 2009-07-22

Import patches-unapplied version 0.6.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: bab1d065cf93efe29162f5e298ff68fe2a9aff4c

New changelog entries:
  * New major upstream release. Closes: #530348
  * Remove patches that have been merged upstream or are obsolete
    - debian/patches/01-limits.patch
    - debian/patches/02-telinit-u.patch
    - debian/patches/03-static-convenience-libs.patch
  * Add Build-Depends on pkg-config (>= 0.22), libdbus-1-dev (>= 1.2.16) and
    libexpat1-dev (>= 2.0.0). D-Bus has replaced the home-grown IPC.
  * Bump Standards-Version to 3.8.2. No further changes.
  * debian/copyright
    - Update copyright years.
    - Clarify license text, Upstart is GPL-2 only.
    - Refer to the versioned GPL-2 document.
  * Drop upstart-logd package. The logd daemon has been buggy for quite a
    while and thus removed completely upstream.
  * debian/upstart.postinst
    - Use "telinit u" to tell init to re-exec itself.
  * debian/rules
    - Remove obsolete configure flag.
    - Use dh_install instead of copying the job files around manually.
  * Merge the upstart-compat-sysv, startup-tasks and system-services package
    into a single upstart package to avoid any unnecessary diversion between
    the Debian and Ubuntu packaging.
  * The location of the job files has changed from /etc/event.d to /etc/init,
    in addition a *.conf suffix is now mandatory.
  * Install rc.conf, rc-sysinit.conf, rcS.conf and control-alt-delete.conf as
    provided by upstream.
  * debian/conf/*.conf
    - Update tty job files for the new job syntax. Add a description and
      author field.
    - Add dbus-reconnect.conf which tells Upstart to reconnect to the D-Bus
      system bus when runlevel 2345 has been reached.
  * Update debian/upstart.install to reflect the changes above.
  * Drop debian/upstart.dirs, obsolete.
  * debian/README.Debian
    - Sync relevant changes from the latest Ubuntu package.
    - Remove outdated information.
  * Add initial support for upstart-job.
    upstart-job is both a virtual package and also small helper utility which
    allows to execute native upstart jobs while preserving the legacy sysv
    "/etc/init.d/<service> <action>" interface.

bab1d06... by Michael Biebl on 2009-04-09

Import patches-unapplied version 0.3.9-2 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: ce21adf8236267db369593b8840015b7d924988b

New changelog entries:
  * debian/control
    - Bump Standards-Version to 3.8.1. No further changes.
    - Update Vcs-* fields. Package is now managed with Git on git.debian.org.
    - Bump Build-Depends on debhelper to (>= 7).
  * debian/compat
    - Bump debhelper compat level to 7.
  * debian/rules
    - Use dh_prep instead of dh_clean -k.
    - Depend on $(QUILT_STAMPFN) instead of patch; patch is a phony target and
      thus always out of date.
    - Move $(QUILT_STAMPFN) dependency to config.status to avoid potential
      issues with parallel make.
  * debian/upstart-compat-sysv.preinst
    - Remove obsolete conffiles also on (re)install.
  * debian/patches/01-limits.patch
    - Include limits.h to fix build failures with current glibc.
      Patch taken from Ubuntu.
  * debian/patches/02-telinit-u.patch
    - Implement "telinit u" by sending Upstart SIGTERM.
      Patch taken from Ubuntu.
  * debian/patches/03-static-convenience-libs.patch
    - Build libnih and libupstart as static convenience libraries.
      Patch taken from Ubuntu.
  * Use set -e instead of #!/bin/sh -e for all maintainer scripts.

ce21adf... by Michael Biebl on 2007-10-22

Import patches-unapplied version 0.3.9-1 to debian/experimental

Imported using git-ubuntu import.