lp:~jamesodhunt/upstart/override-support
- Get this branch:
- bzr branch lp:~jamesodhunt/upstart/override-support
Branch merges
- Scott James Remnant: Pending requested
-
Diff: 4846 lines (+2341/-335)12 files modifiedinit/conf.c (+492/-52)
init/conf.h (+40/-0)
init/job_class.c (+1/-1)
init/man/init.5 (+144/-23)
init/man/init.8 (+2/-1)
init/parse_conf.c (+6/-0)
init/parse_job.c (+18/-6)
init/parse_job.h (+3/-3)
init/paths.h (+50/-0)
init/tests/test_conf.c (+1295/-2)
init/tests/test_parse_job.c (+282/-243)
util/man/initctl.8 (+8/-4)
Branch information
Recent revisions
- 1261. By James Hunt
-
* (debug_
count_list_ entries) : Fixed debug function which always counted
conf_sources list, rather than that specified. - 1260. By James Hunt
-
* Generic
- fixed typos.
- addition of debug functions useful for gdb sessions (available
only in DEBUG build).
* init/conf.c:
- (conf_reload): Removed ENOENT check to ensure error thrown if
conf files/dirs do not exist.
- (conf_reload_path): Now takes an extra override_path parameter.
- (is_conf_file/is_ conf_file_ std/is_ conf_file_ override) : New
functions to determine type of given file path.
- (toggle_conf_name): New function which convert a conf file
name to an override name and vice versa.
- majority of remaining functions updated to handle override
files.
* init/man/init.5: Updated to document override file support.
* init/man/init.8: Added reference to control-alt-delete( 7) man page.
* init/paths.h: New macros CONF_EXT_OVERRIDE, CONF_EXT_STD,
IS_CONF_FILE_OVERRIDE and IS_CONF_FILE_STD.
* init/parse_conf.c: Added assertion to remind us forcibly to add
override-handling code for directories if we ever allow content in
'init.conf'.
* init/parse_job.c (parse_job): Additional parameter 'update' to
allow override files to replace existing Job details.
* init/test_conf.c
- New macros TEST_ENSURE_CLEAN_ENV( ) and
TEST_FORCE_WATCH_ UPDATE( ).
- test_override(): New function.
- test_toggle_conf_name( ): New function.
* init/test_parse_job. c:
- Updated for extra parse_job() parameter
- added a test feature to test_parse_job() to exercise new
parameter to parse_job().
* util/man/initctl.8: Clarified what it means to restart a job. - 1259. By Petr Lautrbach
-
* init/job_process.c (job_process_
termianted) : Don't rewind the
utmp file between updates.
* init/tests/test_job_ process. c (test_utmp): Add test case for
newer mingetty behaviour. - 1258. By Scott James Remnant (Canonical)
-
* contrib/
bash_completion /upstart: Add bash completion script.
* contrib/Makefile.am (EXTRA_DIST): Include in tarball.
* NEWS: Update. - 1256. By Petr Lautrbach
-
* init/job_process.c (job_process_
terminated) : On termination of
a job, update the utmp file replacing any existing entry for that
pid with a DEAD_PROCESS entry; likewise append an entry to wtmp.
* init/tests/test_job_ process. c (test_utmp): Test utmp handling. - 1254. By Scott James Remnant (Canonical)
-
* configure.ac: Bump version to 0.6.8
* NEWS: Begin new release
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~canonical-scott/upstart/trunk