lp:~jamesodhunt/upstart/upstream-udev+socket-bridges

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1307

Upstart Developers: Pending requested 2011-06-06

Diff: 2371 lines (+1631/-110)

34 files modified

.bzrignore (+4/-0)
Makefile.am (+1/-1)
configure.ac (+6/-3)
dbus/com.ubuntu.Upstart.xml (+7/-0)
extra/Makefile.am (+125/-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/conf.c (+0/-1)
init/control.c (+38/-9)
init/control.h (+4/-0)
init/environ.c (+0/-1)
init/environ.h (+0/-1)
init/event.c (+13/-0)
init/event.h (+1/-0)
init/event_operator.c (+59/-0)
init/event_operator.h (+8/-0)
init/job.c (+3/-0)
init/job.h (+3/-0)
init/job_process.c (+0/-1)
init/job_process.h (+0/-1)
init/main.c (+0/-1)
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/POTFILES.in (+2/-0)
po/upstart.pot (+175/-85)
util/reboot.c (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1259. By James Hunt on 2011-06-06

* extra/man/upstart-udev-bridge.8:
  - Explain form of events emitted.
  - Add missing references.
  - Update copyright.

1258. By James Hunt on 2011-06-06

* extra/upstart-udev-bridge.conf: Added "emits" stanza
  (required for "initctl check-config").

1257. By James Hunt on 2011-06-06

* extra/Makefile.am: Add man page links for some common
  upstart-udev-bridge events:
  - net-device-added
  - net-device-removed
  - graphics-device-added
  - drm-device-added

1256. By James Hunt on 2011-06-06

Copyright update.

1255. By James Hunt on 2011-05-15

* Merge from upstream.

1254. By James Hunt on 2011-05-15

* extra/Makefile.am: Added socket-bridge.conf and manual pages
  to distribution.
* extra/upstart-socket-bridge.c: job_add_socket(): memset fix (before, only
  part of the Socket object was being initialized).
* New files:
  - extra/conf/upstart-socket-bridge.conf: Job configuration file for
    socket bridge.
  - extra/man/socket-event.7: Man page for socket event. Naming is due
    to collision with existing socket(7) page.
  - extra/man/upstart-socket-bridge.8: Man page for socket bridge.

1253. By Scott James Remnant (Canonical) on 2010-12-10

Here's a quick pass at adding file descriptors to the events and
ultimately to the job.

This needs a small patch to libnih-dbus to add DBUS_TYPE_UNIX_FD <-> int
mappings

1252. By Scott James Remnant (Canonical) on 2010-12-10

Need a destructor to close the socket

1251. By Scott James Remnant (Canonical) on 2010-12-10

Support abstract sockets with:

 start on socket PROTO=unix PATH=@/at/upstart/example

1250. By Scott James Remnant (Canonical) on 2010-12-10

Ok, that's about 90% of a socket bridge for upstart, it'll handle the
following:

 start on socket PROTO=inet PORT=1234
 start on socket PROTO=unix PATH=/var/run/.s.pgsql.1234

Missing piece is actually getting the socket across, which needs a patch
to libnih-dbus