summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-06-26 00:03:43 +0200
committerLennart Poettering <lennart@poettering.net>2012-06-26 00:03:43 +0200
commit2aac569ab4f7fa21cf634f5a82c1c7d69381ab25 (patch)
tree18df2514a9e547170c0cf5dd794be6186486fffa
parentc84fe6fdf579ff8a69c0fc308ae4f00dfa0eb4a1 (diff)
bus: drop HaveWatchdog option
Clients should always watch /dev/watchdog directly, instead of going indirect. Let's keep our stacks small.
-rw-r--r--src/core/dbus-manager.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index d3b26b70d1..cd827ca458 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -247,8 +247,7 @@
" <property name=\"DefaultStandardOutput\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"DefaultStandardError\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"RuntimeWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n" \
- " <property name=\"ShutdownWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n" \
- " <property name=\"HaveWatchdog\" type=\"b\" access=\"read\"/>\n"
+ " <property name=\"ShutdownWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n"
#define BUS_MANAGER_INTERFACE_END \
" </interface>\n"
@@ -495,20 +494,6 @@ static int bus_manager_send_unit_files_changed(Manager *m) {
return r;
}
-static int bus_manager_append_have_watchdog(DBusMessageIter *i, const char *property, void *data) {
- dbus_bool_t b;
-
- assert(i);
- assert(property);
-
- b = access("/dev/watchdog", F_OK) >= 0;
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
-
- return 0;
-}
-
static int bus_manager_set_runtime_watchdog_usec(DBusMessageIter *i, const char *property, void *data) {
uint64_t *t = data;
@@ -557,7 +542,6 @@ static const BusProperty bus_manager_properties[] = {
{ "DefaultStandardError", bus_manager_append_exec_output, "s", offsetof(Manager, default_std_error) },
{ "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 },
{ NULL, }
};