lp:~upstart-devel/upstart/0.9
- Get this branch:
- bzr branch lp:~upstart-devel/upstart/0.9
Branch merges
- Scott James Remnant (community): Needs Fixing
-
Diff: 17059 lines (+10051/-881) (has conflicts)67 files modified.bzrignore (+4/-0)
ChangeLog (+453/-0)
Makefile.am (+1/-1)
NEWS (+101/-0)
conf/rc-sysinit.conf (+2/-0)
configure.ac (+11/-2)
contrib/bash_completion/upstart (+34/-10)
dbus/Upstart.conf (+6/-36)
dbus/com.ubuntu.Upstart.xml (+7/-0)
dbus/upstart.h (+1/-1)
extra/Makefile.am (+126/-0)
extra/conf/upstart-socket-bridge.conf (+16/-0)
extra/conf/upstart-udev-bridge.conf (+16/-0)
extra/man/socket-event.7 (+92/-0)
extra/man/upstart-socket-bridge.8 (+47/-0)
extra/man/upstart-udev-bridge.8 (+57/-0)
extra/upstart-socket-bridge.c (+644/-0)
extra/upstart-udev-bridge.c (+310/-0)
init/Makefile.am (+25/-0)
init/conf.c (+510/-53)
init/conf.h (+45/-2)
init/control.c (+111/-19)
init/control.h (+18/-0)
init/event.c (+22/-1)
init/event.h (+6/-1)
init/event_operator.c (+59/-0)
init/event_operator.h (+8/-0)
init/job.c (+46/-2)
init/job.h (+4/-1)
init/job_class.c (+113/-23)
init/job_class.h (+5/-1)
init/job_process.c (+59/-0)
init/job_process.h (+3/-1)
init/main.c (+244/-46)
init/man/init.5 (+225/-51)
init/man/init.8 (+34/-5)
init/parse_conf.c (+6/-0)
init/parse_job.c (+20/-6)
init/parse_job.h (+4/-2)
init/paths.h (+90/-6)
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/-10)
init/tests/test_environ.c (+3/-0)
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/-64)
init/tests/test_job_process.c (+34/-29)
init/tests/test_parse_conf.c (+3/-0)
init/tests/test_parse_job.c (+285/-243)
init/tests/test_process.c (+3/-0)
init/tests/test_system.c (+3/-0)
po/POTFILES.in (+2/-0)
po/upstart.pot (+399/-73)
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 (+1030/-19)
util/initctl.h (+458/-0)
util/man/initctl.8 (+204/-35)
util/tests/test_initctl.c (+1184/-20)
Branch information
Recent revisions
- 1290. By James Hunt
-
* scripts/
init-checkconf. sh:
- New function upstart_running.
- We now check to ensure no other instance running.
- Use list command rather than status since the latter requires an
instance variable to be specified (LP: #770532).
- Improve cleanup safety.
* scripts/man/init- checkconf. 8: Added limitations section. - 1288. By James Hunt
-
* control_
get_job_ by_name: Fix to relax session rigidity for user
sessions (allow user sessions to see into the global
namespace for backwards compatability) (LP: #767053). - 1286. By James Hunt
-
* init/conf.c:
- conf_source_reload_ file(): Added missing error return if override
doesn't parse (code path currently unused).
- Documentation updates.
* init/job.c: job_new(): Fix for nasty OOM scenario when an attempt is made
to start a chroot job with same name as running single-instance non-chroot
job. Previously, the path for a chrooted Job was set from the (nul) instance
name of its parent JobClass. However, since that job instance name already
existed outside the chroot and was already D-Bus registered,
nih_dbus_object_ new() (which allocates storage and is called by
job_register()) returned NULL and kept doing so due to being called
within NIH_MUST(). This resulted in OOM due to an as-yet unidentified
D-Bus bug (possibly a leak in find_subtree_recurse( )).
* init/session.h: Documentation updates.
* util/test_initctl. c: Cleaned up variable names
in RUN_COMMAND macro.
* init/parse_job.c: Documentation updates. - 1284. By James Hunt
-
* init/conf.c: conf_select_job(): Added Session parameter.
* init/control.c: control_get_job_ by_name( ): Handle multiple jobs with same
name (but different session) in job_classes hash.
* init/job_class.c:
- job_class_remove(): Added Session parameter.
- job_class_consider( ): Handle multiple jobs with same name
(but different session) in job_classes hash.
- job_class_reconsider( ): Handle multiple jobs with same name
(but different session) in job_classes hash.
- job_class_remove(): Handle incorrect session.
* init/job_process.c: job_process_spawn() : Updated for sessions and
chroots.
* init/job_process.h: New enums for:
- JOB_PROCESS_ERROR_SETUID
- JOB_PROCESS_ERROR_SETGID
* init/session.c:
- session_from_dbus( ): Added ability to disable sessions.
- Added disable_sessions variable, set via main().
* init/session.h: Added tabular comment summarising Session object
contents for different environments.
* init/Makefile.am: Reverted special-casing for session.c.
* init/main.c: Addition of new command-line option "--no-sessions" to
disable chroot+user sessions (providing a "traditional" Upstart
environment. The primary use for this option is the test suite.
* init/man/init.8: Updates for "--no-sessions".
* init/tests/test_*. c: Replaced explicit Sessions with NULL
session since tests are not yet session-aware (with the exception of
test_job_process. c, all main() functions now set the
UPSTART_NO_SESSIONS variable to disable sessions).
* util/tests/test_initctl. c:
- START_UPSTART now specifies "--no-sessions"
- test_check_config( ): Added test for "--warn".
* scripts/init-checkconf. sh: Script now also checks any script
sections found unless the new "--noscript" option is specified.
Added required "--no-sessions" option to upstart_cmd to ensure Upstart
treats clients requests in traditional manner.
* scripts/man/init- checkconf. 8: Update for "--noscript".
* util/initctl.c: Added "--warn" option for check-config command to
warn if any events or jobs are not known. - 1283. By James Hunt
-
* init/tests/
test_control. c: Added comment.
* scripts/initctl2dot. py: Fixes to handle 'emits' glob syntax:
- header(): Change default node to be an event to simplify handling
globs in 'emits' stanzas.
- footer(): Updated for glob event nodes.
- sanitize(): Protect against glob syntax.
- show_event(): Update for glob event nodes.
- show_job(): Explicit specification of record node.
- show_edges(): Handle 'emits' glob syntax. - 1282. By James Hunt
-
* po/upstart.pot: committed changes to file to resolve conflict on
lp:ubuntu/upstart merge.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:upstart