diff options
| author |   Lennart Poettering <lennart@poettering.net> | 2014-11-19 20:52:23 +0100 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2014-11-23 13:23:14 -0500 |
| commit | 6af12a7fed0211ea80bbf994619a1e821468bc37 (patch) | |
| tree | abf7d6b8468f7be9639ad14cfe7b6c9f2beaa540 | |
| parent | shared: create files even if the SELinux policy has no context for them (diff) | |
| download | systemd-6af12a7fed0211ea80bbf994619a1e821468bc37.tar.gz systemd-6af12a7fed0211ea80bbf994619a1e821468bc37.tar.bz2 systemd-6af12a7fed0211ea80bbf994619a1e821468bc37.zip | |
core: watchdog bus properties cannot be both writable and constant
| -rw-r--r-- | src/core/dbus-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index c54abd3b4..1384e8fab 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1884,8 +1884,8 @@ const sd_bus_vtable bus_manager_vtable[] = { SD_BUS_PROPERTY("UnitPath", "as", NULL, offsetof(Manager, lookup_paths.unit_path), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("DefaultStandardOutput", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("DefaultStandardError", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogUSec", "t", bus_property_get_usec, property_set_runtime_watchdog, offsetof(Manager, runtime_watchdog), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_WRITABLE_PROPERTY("ShutdownWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, shutdown_watchdog), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogUSec", "t", bus_property_get_usec, property_set_runtime_watchdog, offsetof(Manager, runtime_watchdog), 0), + SD_BUS_WRITABLE_PROPERTY("ShutdownWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, shutdown_watchdog), 0), SD_BUS_PROPERTY("ControlGroup", "s", NULL, offsetof(Manager, cgroup_root), 0), SD_BUS_PROPERTY("SystemState", "s", property_get_system_state, 0, 0), |