diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-01-06 23:08:54 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-01-06 23:08:54 +0100 |
| commit | 57020a3abff20f176e9f0cbb982d7977119d6f08 (patch) | |
| tree | 3b3d69307cecce0dc4ad25aa074c2a0db64bdfb6 /src/dbus-service.c | |
| parent | 73aa0c00df8b101bad4c3a038148a633df88610c (diff) | |
unit: properly update references to units which are merged
When we merge units that some kind of object points to, those pointers
might become invalidated, and needs to be updated. Introduce a UnitRef
struct which links up all the unit references, to ensure corrected
references.
At the same time, drop configured_sockets in the Service object, and
replace it by proper UNIT_TRIGGERS resp. UNIT_TRIGGERED_BY dependencies,
which allow us to simplify a lot of code.
Diffstat (limited to 'src/dbus-service.c')
| -rw-r--r-- | src/dbus-service.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/dbus-service.c b/src/dbus-service.c index 3486623e59..373e3f56b0 100644 --- a/src/dbus-service.c +++ b/src/dbus-service.c @@ -59,7 +59,6 @@ " <property name=\"BusName\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"StatusText\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"FsckPassNo\" type=\"i\" access=\"read\"/>\n" \ - " <property name=\"Sockets\" type=\"as\" access=\"read\"/>\n" \ BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \ " </interface>\n" @@ -120,7 +119,6 @@ DBusHandlerResult bus_service_message_handler(Unit *u, DBusConnection *connectio { "org.freedesktop.systemd1.Service", "ControlPID", bus_property_append_pid, "u", &u->service.control_pid }, { "org.freedesktop.systemd1.Service", "BusName", bus_property_append_string, "s", u->service.bus_name }, { "org.freedesktop.systemd1.Service", "StatusText", bus_property_append_string, "s", u->service.status_text }, - { "org.freedesktop.systemd1.Service", "Sockets", bus_unit_append_dependencies, "as", u->service.configured_sockets }, #ifdef HAVE_SYSV_COMPAT { "org.freedesktop.systemd1.Service", "SysVRunLevels", bus_property_append_string, "s", u->service.sysv_runlevels }, { "org.freedesktop.systemd1.Service", "SysVStartPriority", bus_property_append_int, "i", &u->service.sysv_start_priority }, |