Created by James Hunt and last modified
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-1083723
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

James Hunt

Recent revisions

1396. By James Hunt

* init/control.c: control_restart():
  - Simplified session check.
* util/telinit.c:
  - init_is_upstart(): Removed as redundant.
  - upstart_open(): Removed erroneous comment.
  - restart_upstart(): Changed return values for consistency with other
    calls in main() where an error is expected to set ret to < 0.
  - main(): Just call restart_upstart() in re-exec scenario to avoid the
    creation of a second D-Bus connection.

1395. By James Hunt

* util/telinit.c:
  - upstart_open(): Return raised error on failure.
  - init_is_upstart(): Consume raised error on failure.
  - restart_upstart(): New function to request re-exec.
  - main(): Rather than sending PID 1 a SIGTERM in the 'telinit u' scenario,
    request via D-Bus that it restart itself iff it is Upstart. Although
    this could all be handled with the single "Restart" D-Bus method request,
    check PID 1 is Upstart first since this way, it is possible to detect
    and report that the restart request failed.

1394. By James Hunt

* dbus/com.ubuntu.Upstart.xml: New 'Restart' method.
* init/control.c: control_restart(): New function to request Upstart
  restart itself.
* init/control.c: Added prototype for control_restart().

1393. By James Hunt

* util/telinit.c:
  - upstart_open(): Don't display messages on failure since these would
    only be seen in non-Upstart scenarios and are just noise.
  - main():
    - Wrap check for 'u', not 'q'!
    - Initialise ret to ensure error handling not invoked in
      non-Upstart scenarios.

1392. By James Hunt

* util/Makefile.am: Give telinit access to auto-generated D-Bus bindings.
* util/man/telinit.8: Update for 'telinit u' behaviour if PID 1 is not
* util/telinit.c: Make 'telinit u' a nop if PID 1 is not Upstart
  (LP: #1083723).

1391. By James Hunt

* Merge of lp:~vorlon/upstart/fix-environ-order-assumption.
* init/tests/test_job_process.c: child(): Removed unused variables
  'buffer' and 'in' causing tests to fail when compiled with full

1390. By James Hunt

[ Colin King <email address hidden> ]

* init/log.c: log_serialise(): smatch-found issue where
  additional checks required for log->unflushed to avoid any
  possibility of NULL dereference.
* init/state.c: state_read_objects(): smatch-found issue
  to correct read size and ensure optimal throughput.

1389. By Steve Langasek

simplify code: avoid extra unnecessary strdup

1388. By James Hunt

* init/job_process.c: job_process_log_path(): Make chroot jobs log
  inside the chroot (LP: #1079710).
* init/man/init.5:
  - State that jobs started from within a chroot are distinct from jobs
    specifying the chroot stanza.
  - State explicitly where chroot output is logged.

1387. By Steve Langasek

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.