[systemd-commits] src/dbus-execute.c

[Michal Schmidt]

 src/dbus-execute.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 229b5d55f620704d62b91d824f429a6cf07e070c
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Fri Jan 20 03:03:25 2012 +0100

    dbus-execute: don't publish control_group_persistent on DBus for now
    
    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.

diff --git a/src/dbus-execute.c b/src/dbus-execute.c
index 925cbb5..db7cc2f 100644
--- a/src/dbus-execute.c
+++ b/src/dbus-execute.c
@@ -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, }
 };