diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-06-22 16:18:47 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-06-22 16:18:51 +0200 |
| commit | a3a3e5b6ae7836152052d77a9e6032a9e84e2039 (patch) | |
| tree | 31906d20cd9f188eaf425e818d2d946a539e73e6 | |
| parent | d081dffbd3e57dc9da494a3384e333bf565d4175 (diff) | |
dbus: don't expose SysVInitPath and SysVRcndPath on the bus
People should use systemd.pc if anything at all to determine these
directories, and people should not assume that the bus fields are part
of the supported API, so let's just drop this.
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | src/core/dbus-manager.c | 13 |
2 files changed, 6 insertions, 13 deletions
@@ -395,3 +395,9 @@ Regularly: * pahole * set_put(), hashmap_put() return values check. i.e. == 0 doesn't free()! + +Scheduled for removal (or fixing): + +* xxxOverridable dependencies + +* Names= unit option diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index f57c1eeed7..d3b26b70d1 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -250,14 +250,6 @@ " <property name=\"ShutdownWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n" \ " <property name=\"HaveWatchdog\" type=\"b\" access=\"read\"/>\n" -#ifdef HAVE_SYSV_COMPAT -#define BUS_MANAGER_INTERFACE_PROPERTIES_SYSV \ - " <property name=\"SysVInitPath\" type=\"as\" access=\"read\"/>\n" \ - " <property name=\"SysVRcndPath\" type=\"as\" access=\"read\"/>\n" -#else -#define BUS_MANAGER_INTERFACE_PROPERTIES_SYSV -#endif - #define BUS_MANAGER_INTERFACE_END \ " </interface>\n" @@ -266,7 +258,6 @@ BUS_MANAGER_INTERFACE_METHODS \ BUS_MANAGER_INTERFACE_SIGNALS \ BUS_MANAGER_INTERFACE_PROPERTIES_GENERAL \ - BUS_MANAGER_INTERFACE_PROPERTIES_SYSV \ BUS_MANAGER_INTERFACE_END #define INTROSPECTION_BEGIN \ @@ -567,10 +558,6 @@ static const BusProperty bus_manager_properties[] = { { "RuntimeWatchdogUSec", bus_property_append_usec, "t", offsetof(Manager, runtime_watchdog), false, bus_manager_set_runtime_watchdog_usec }, { "ShutdownWatchdogUSec", bus_property_append_usec, "t", offsetof(Manager, shutdown_watchdog), false, bus_property_set_usec }, { "HaveWatchdog", bus_manager_append_have_watchdog, "b", 0 }, -#ifdef HAVE_SYSV_COMPAT - { "SysVInitPath", bus_property_append_strv, "as", offsetof(Manager, lookup_paths.sysvinit_path), true }, - { "SysVRcndPath", bus_property_append_strv, "as", offsetof(Manager, lookup_paths.sysvrcnd_path), true }, -#endif { NULL, } }; |