lp:~jamesodhunt/upstart/bug-980917

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:upstart

Steve Langasek: Disapprove on 2012-08-02

Diff: 115 lines (+37/-9)

3 files modified

init/main.c (+29/-3)
init/system.c (+6/-5)
init/system.h (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1374. By James Hunt on 2012-08-02

* init/main.c:main(): Create /dev/ptmx and mount /dev and /dev/pts to
  handle scenario where Upstart boots in a non-initramfs environment
  (LP: #980917).
* init/system.c: system_mount(): Add flags parameter (to allow /dev and
  /dev/pts to be mounted without MS_NODEV).
* init/system.h: system_mount(): Updated prototype.

1373. By James Hunt on 2012-07-31

Document calls to 'stop' and 'start' with no arguments in
pre-start/pre-stop stanzas.

1372. By James Hunt on 2012-07-31

[ Eric S. Raymond <email address hidden> ]
* extra/man/socket-event.7: Fixed incorrect troff (LP: #1018925).

1371. By James Hunt on 2012-03-25

* extra/conf/upstart-udev-bridge.conf: Added more precise emits stanza
  (from Ubuntu).
* util/man/initctl.8: Explain that non-priv users can manage jobs if
  D-Bus configured appropriately (from Ubuntu).

1370. By James Hunt on 2012-03-22

* NEWS: Begin new release.
* configure.ac: Bump version to 1.6.

1369. By James Hunt on 2012-03-22

* Changelog: Release entry.
* NEWS: Release 1.5.
* configure.ac: Bump year.

1368. By James Hunt on 2012-03-16

* log.c: log_read_watch(): Set remote_closed for scenarios where
  error handler never called. (LP: #935585)

1367. By James Hunt on 2012-03-16

* dbus/com.ubuntu.Upstart.xml:
  - added 'NotifyDiskWriteable' method.
* init/control.c:
  - control_notify_disk_writeable(): New function to flush early job log.
* init/job_process.c:
  - job_process_terminated(): Call log_handle_unflushed() to potentially
    add log object to unflushed list (the early job log) in certain
    scenarios.
* init/log.c:
  - log_flushed: bool indicating successful flush of early job log.
  - log_unflushed_files: The "early job log" list.
  - log_new(): Call log_unflushed_init() and initialize new log members.
  - log_flush(): Only call log_read_watch() conditionally now.
  - log_io_reader(): More careful consideration of errno by
    using saved value from log member.
  - log_io_error_handler(): Set remote_closed for the benefit of
    log_flushed() (to avoid flushing multiple times).
  - log_file_open: Now saves errno value from open(2).
  - log_read_watch(): Removed log->unflushed->len assert since it was
    erroneous: even if unflushed data exists, it will be written in
    order when log_io_reader() calls log_file_write().
  - log_unflushed_init(): New function to initialise the
    log_unflushed_files list.
  - log_handle_unflushed(): New function that potentially adds log
    object to the log_unflushed_files list to allow the data to be
    flushed _after_ the parent object has been destroyed.
  - log_clear_unflushed(): New function to clear the
    log_unflushed_files list by attempting to flush the data to disk.
* init/log.h:
  - Added new Log members: detached, remote_closed and open_errno.
  - Updated documentation.
  - extern for log_unflushed_files.
  - Added prototypes for new functions: log_handle_unflushed(),
    log_clear_unflushed() and log_unflushed_init().
* init/tests/test_job_process.c:
  - test_run():
    - Call log_unflushed_init().
    - Corrected grammar in error messages for "ensure sane fds" tests.
    - "with single line command writing fast and exiting": Call
      nih_child_add_watch().
    - added waitid() calls to ensure log data not added to
      unflushed list.
  - test_spawn():
    - Call log_unflushed_init().
    - Corrected grammar in error messages for "ensure sane fds" tests.
    - Added TEST_ALLOC_SAFE() to "simple test" to ensure
      destructors run correctly.
    - "read single null byte with 'console log'": Call
      log_handle_unflushed() and added missing free.
    - "read data from forked process": Call
      log_handle_unflushed().
* init/tests/test_log.c:
  - Updated documentation.
  - Added calls to log_unflushed_init().
  - "ensure logger flushes cached data on request": New test
    for log_handle_unflushed().
* util/initctl.c:
  - notify_disk_writeable_action(): New function to notify
    Upstart that the disk is writeable.
  - commands: Added new command "notify-disk-writeable".
* util/man/initctl.8: Updated for new notify-disk-writeable command.
* util/tests/test_initctl.c:
  - STOP_UPSTART(): Check return from kill(2).
  - test_show_config(): Adding missing rmdir(2).
  - test_check_config(): Adding missing rmdir(2).
  - test_notify_disk_writeable(): New function embodying new test
    "with job ending before log disk writeable".

1366. By James Hunt on 2012-03-16

* job_process_spawn(): Only display single message
  if pty setup fails.
* init/man/init.5: Typo.
* init/tests/test_job_process:
  - child(): New TEST_OUTPUT_WITH_STOP test.
  - test_run(): New test "with multiple processes and log".
  - test_spawn():
    - umask reset.
    - New test "ensure multi processes output logged".

1365. By James Hunt on 2012-03-16

* init/tests/test_job_process:
  - Fixed multiple TEST_FAILED() typos
    ("unexpected" => unexpectedly").