lp:~jamesodhunt/upstart/upstream-initctl-check-config

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1306

Upstart Developers: Pending requested 2011-06-03

Diff: 5002 lines (+3534/-334)

26 files modified

ChangeLog (+114/-0)
conf/rc-sysinit.conf (+2/-0)
configure.ac (+1/-1)
init/conf.c (+0/-1)
init/control.c (+33/-7)
init/control.h (+15/-1)
init/environ.c (+0/-1)
init/environ.h (+0/-1)
init/job_process.c (+0/-1)
init/job_process.h (+0/-1)
init/main.c (+229/-136)
init/man/init.5 (+16/-1)
init/man/init.8 (+23/-2)
init/paths.h (+16/-2)
init/tests/test_conf.c (+0/-1)
init/tests/test_control.c (+0/-1)
init/tests/test_environ.c (+0/-1)
init/tests/test_job_class.c (+0/-1)
init/tests/test_job_process.c (+0/-1)
po/upstart.pot (+268/-134)
util/Makefile.am (+1/-1)
util/initctl.c (+1014/-17)
util/initctl.h (+458/-0)
util/man/initctl.8 (+163/-2)
util/reboot.c (+0/-1)
util/tests/test_initctl.c (+1181/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1295. By James Hunt on 2011-06-06

* util/man/init.5:
  - Update for format of "emit" events.
  - Add reference to initctl.
  - Typo.

1294. By James Hunt on 2011-06-03

* util/initctl.c:check_config_action(): Fixed invalid test which
  resulted in leaked memory.

1293. By James Hunt on 2011-06-01

* Changelog: updated.
* conf/rc-sysinit.conf: Added emits stanza as required by
  "initctl check-config".

1292. By James Hunt on 2011-06-01

* Changelog: Update for "check-config".

1291. By James Hunt on 2011-06-01

Merge of lp:~jamesodhunt/upstart/1.3.

1290. By James Hunt on 2011-06-01

Add "check-config" command to initctl.

* util/initctl.c:
  - New functions:
    - allow_event(): Determine if specified event is erroneous or not.
      Handles globbing.
    - allow_job(): Determine if specified job is erroneous or not.
      Handles variables (such as instance variables).
    - check_condition(): High-level function to handle checking start
      on/stop on conditions.
    - check_config_action: Handler for "check-config" command.
    - display_check_errors(): Display errors from expression tree nodes
      that are in error.
    - eval_expr_tree(): Evaluate expression tree.
    - ignored_events_setter(): handler for '--ignore-events' command-line
      option for "check-config" command.
    - tree_filter(): Used for filtering expression tree nodes.
  - show_config_action(): Update for check-config mode.
  - job_class_parse_events(): Update for check-config mode.
  - job_class_show_emits(): Update for check-config mode.
* util/initctl.h:
  - Added structs for JobCondition, CheckConfigData and ExprNode.
  - New macros: MAKE_EXPR_NODE() and MAKE_JOB_CONDITION().
* util/tests/test_initctl.c:
  - test_check_config(): New function to test "initctl check-config".
  - main(): Added call to test_check_config(), conditional on
    a non-chroot environment and a working D-Bus system.
* util/man/initctl.8: Updated for "check-config" command and associated
  options.

1289. By James Hunt on 2011-06-01

Merge of lp:~jamesodhunt/upstart/upstream-initctl-show-config.

1288. By James Hunt on 2011-06-01

Re-merge of lp:~jamesodhunt/upstart/upstream-add-session-bus-support
for initctl D-Bus session support.

1287. By James Hunt on 2011-05-31

Merge of lp:~jamesodhunt/upstart/upstream-change-startup-event.

1286. By James Hunt on 2011-05-31

Remerge of lp:~jamesodhunt/upstart/upstream-configurable-confdir to get
man page update.