lp:~jamesodhunt/upstart/upstream-override-support
- Get this branch:
- bzr branch lp:~jamesodhunt/upstart/upstream-override-support
Branch merges
- Upstart Developers: Pending requested
-
Diff: 15469 lines (+8378/-1087)57 files modifiedChangeLog (+219/-0)
Makefile.am (+1/-1)
TESTING.sessions (+252/-0)
conf/rc-sysinit.conf (+2/-0)
configure.ac (+3/-2)
contrib/bash_completion/upstart (+96/-36)
dbus/Upstart.conf (+6/-36)
dbus/upstart.h (+1/-1)
init/Makefile.am (+12/-0)
init/conf.c (+505/-55)
init/conf.h (+45/-2)
init/control.c (+73/-10)
init/control.h (+15/-1)
init/environ.c (+0/-1)
init/environ.h (+0/-1)
init/event.c (+10/-0)
init/event.h (+5/-1)
init/job.c (+44/-3)
init/job.h (+1/-1)
init/job_class.c (+114/-24)
init/job_class.h (+5/-1)
init/job_process.c (+59/-1)
init/job_process.h (+4/-3)
init/main.c (+234/-136)
init/man/init.5 (+170/-44)
init/man/init.8 (+30/-4)
init/parse_conf.c (+6/-0)
init/parse_job.c (+21/-7)
init/parse_job.h (+4/-2)
init/paths.h (+75/-2)
init/session.c (+279/-0)
init/session.h (+87/-0)
init/tests/test_blocked.c (+4/-1)
init/tests/test_conf.c (+1310/-15)
init/tests/test_control.c (+15/-11)
init/tests/test_environ.c (+3/-1)
init/tests/test_event.c (+28/-25)
init/tests/test_event_operator.c (+3/-0)
init/tests/test_job.c (+71/-76)
init/tests/test_job_class.c (+56/-65)
init/tests/test_job_process.c (+34/-30)
init/tests/test_parse_conf.c (+3/-0)
init/tests/test_parse_job.c (+302/-260)
init/tests/test_process.c (+3/-0)
init/tests/test_system.c (+3/-0)
po/upstart.pot (+307/-155)
scripts/Makefile.am (+25/-0)
scripts/init-checkconf.sh (+248/-0)
scripts/initctl2dot.py (+571/-0)
scripts/man/init-checkconf.8 (+73/-0)
scripts/man/initctl2dot.8 (+87/-0)
util/Makefile.am (+1/-1)
util/initctl.c (+1014/-17)
util/initctl.h (+458/-0)
util/man/initctl.8 (+200/-35)
util/reboot.c (+0/-1)
util/tests/test_initctl.c (+1181/-19)
Branch information
Recent revisions
- 1264. By James Hunt
-
* init/conf.c: conf_reload(): Back out change where we do not ignore
ENOENT for missing conf files/dirs since this is a non-override file
change. - 1262. By James Hunt
-
* init/conf.c:
- conf_source_reload_ file(): Added missing error return if override
doesn't parse (code path currently unused).
- conf_reload_path(): Documentation updates and whitespace fixes. - 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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:upstart