chiark / gitweb /
dbus-execute: don't publish control_group_persistent on DBus for now
authorMichal Schmidt <mschmidt@redhat.com>
Fri, 20 Jan 2012 02:03:25 +0000 (03:03 +0100)
committerMichal Schmidt <mschmidt@redhat.com>
Fri, 20 Jan 2012 02:03:25 +0000 (03:03 +0100)
Since the addition of ControlGroupPersistent, systemd is trivially
killed by "systemctl status any.service".
bus_property_append_bool must not be used for a tri-state int.
Also, should it really "b", or do we want the tri-state nature to be seen?

For now just comment out the buggy DBus property.

src/dbus-execute.c

index 925cbb51232fddf283d48eb6abdf311c8203ef1d..db7cc2f1da5a9f8ccd3505dd9784e47d584bae7a 100644 (file)
@@ -416,6 +416,6 @@ const BusProperty bus_exec_context_properties[] = {
         { "KillSignal",               bus_property_append_int,               "i", offsetof(ExecContext, kill_signal)                  },
         { "UtmpIdentifier",           bus_property_append_string,            "s", offsetof(ExecContext, utmp_id),                true },
         { "ControlGroupModify",       bus_property_append_bool,              "b", offsetof(ExecContext, control_group_modify)         },
-        { "ControlGroupModify",       bus_property_append_bool,              "b", offsetof(ExecContext, control_group_persistent)     },
+/* FIXME{ "ControlGroupPersistent",   bus_property_append_bool,              "b", offsetof(ExecContext, control_group_persistent)     },*/
         { NULL, }
 };