[Merge] lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs into lp:upstart

[James Hunt]

James Hunt has proposed merging lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/allow-multiple-cmdline-confdirs/+merge/156512

This change is required for the upcoming test framework since it is necessary to allow a Session Init to operate in a known environment (crucially without loading in all the standard Session Jobs provided on, for example, an Ubuntu Raring system).

Note this introduces a small behavioural change in that now if --confdir is specified one or more times for a Session Init, *only* those directories specified will be used (whereas before the single confdir specified would be prepended to the standard list of directories searched).


= Future Work =

It might be worth adding the ability for the list of directories being used to be queried both via a new initctl command (for a running instance), and via an init option to see what user directories *would* be used.

= Change Summary =

* init/main.c:
  - main(): Allow Session Init to accept multiple --confdir values,
    which replace all built-in values (behaviour required for testing).
  - handle_confdir(): Operate on conf_dirs array rather than single
    conf_dir value.
  - conf_dir_setter(): Command-line setter function to add configuration
    file directories to conf_dirs array.
* init/man/init.8: Update on --confdir behaviour.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/allow-multiple-cmdline-confdirs/+merge/156512
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 4861 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130402/0614576a/attachment.diff>