diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-01 19:47:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-01 19:47:46 +0200 |
| commit | c87eba546a33ce7ecd66f0e3b61bdf55ae1389f0 (patch) | |
| tree | 8309a2b911264e57f95dcb860983e5f8ea506c40 /src/initctl.c | |
| parent | f306f4c40d7004be058678ff3ed90c9c006767e0 (diff) | |
dbus: add simplified way to start an arbitrary unit in a single method call
Diffstat (limited to 'src/initctl.c')
| -rw-r--r-- | src/initctl.c | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/src/initctl.c b/src/initctl.c index 407d32d93f..9872437aa9 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -96,7 +96,7 @@ static void change_runlevel(Server *s, int runlevel) { const char *target; DBusMessage *m = NULL, *reply = NULL; DBusError error; - const char *path, *replace = "isolate"; + const char *replace = "replace"; assert(s); @@ -109,44 +109,19 @@ static void change_runlevel(Server *s, int runlevel) { log_debug("Running request %s", target); - if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "LoadUnit"))) { + if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) { log_error("Could not allocate message."); goto finish; } if (!dbus_message_append_args(m, DBUS_TYPE_STRING, &target, - DBUS_TYPE_INVALID)) { - log_error("Could not attach group information to signal message."); - goto finish; - } - - if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) { - log_error("Failed to get unit path: %s", error.message); - goto finish; - } - - if (!dbus_message_get_args(reply, &error, - DBUS_TYPE_OBJECT_PATH, &path, - DBUS_TYPE_INVALID)) { - log_error("Failed to parse unit path: %s", error.message); - goto finish; - } - - dbus_message_unref(m); - if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", path, "org.freedesktop.systemd1.Unit", "Start"))) { - log_error("Could not allocate message."); - goto finish; - } - - if (!dbus_message_append_args(m, DBUS_TYPE_STRING, &replace, DBUS_TYPE_INVALID)) { - log_error("Could not attach group information to signal message."); + log_error("Could not attach target and flag information to signal message."); goto finish; } - dbus_message_unref(reply); if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) { log_error("Failed to start unit: %s", error.message); goto finish; |