[systemd-commits] 2 commits - fixme Makefile.am man/daemon.xml man/systemd-install.xml src/dbus-common.c src/dbus-common.h src/dbus-manager.c src/dbus-unit.c src/dbus-unit.h src/install.c src/systemctl.c
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Jul 5 20:25:32 PDT 2010
Makefile.am | 22 +--
fixme | 4
man/daemon.xml | 4
man/systemd-install.xml | 70 +++++++++-
src/dbus-common.c | 83 ++++++++++++
src/dbus-common.h | 31 ++++
src/dbus-manager.c | 7 +
src/dbus-unit.c | 2
src/dbus-unit.h | 4
src/install.c | 317 +++++++++++++++++++++++++++++++++++++++++++++++-
src/systemctl.c | 41 ------
11 files changed, 516 insertions(+), 69 deletions(-)
New commits:
commit 72f957066d9ccc43699c813d0498fc7f6732a838
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jul 6 05:25:24 2010 +0200
man: document new systemd-install --start option
diff --git a/man/daemon.xml b/man/daemon.xml
index 01ab0f3..8e9e939 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -793,11 +793,11 @@ endif</programlisting>
package managers:</para>
<programlisting>%post
-/usr/bin/systemd-install enable foobar.service foobar.socket >/dev/null 2>&1 || :
+/usr/bin/systemd-install --start enable foobar.service foobar.socket >/dev/null 2>&1 || :
%preun
if [ "$1" -eq 0 ]; then
- /usr/bin/systemd-install disable foobar.service foobar.socket >/dev/null 2>&1 || :
+ /usr/bin/systemd-install --start disable foobar.service foobar.socket >/dev/null 2>&1 || :
fi</programlisting>
</refsect2>
diff --git a/man/systemd-install.xml b/man/systemd-install.xml
index 63832aa..c3ec4bd 100644
--- a/man/systemd-install.xml
+++ b/man/systemd-install.xml
@@ -68,10 +68,18 @@
enabled.</para>
<para>This command is useful to apply or undo the
- installation instructions encoded in the [Install]
+ installation instructions encoded in the <literal>[Install]</literal>
section of unit files. See
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information.</para>
+
+ <para>Enabling units (as with <command>systemd-install
+ enable</command>) should not be confused with
+ activating units (as with <command>systemctl
+ start</command>). The former simply installs the unit
+ files in the configuration tree, but does not start
+ them. The latter equals starting them, but does not
+ necessarily require them to be enabled.</para>
</refsect1>
<refsect1>
@@ -120,6 +128,49 @@
session service for all
users.</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>--start[=MODE]</option></term>
+
+ <listitem><para>After
+ enabling/disabling stop/restart the
+ unit and reload manager
+ configuration. Optionally, takes one
+ of <option>no</option>,
+ <option>minimal</option>,
+ <option>maybe</option> or
+ <option>yes</option>. If
+ <option>no</option> is passed the
+ manager will not reload its
+ configuration and no service will be
+ started or stopped after
+ enabling/disabling of the unit
+ files. If <option>minimal</option> is
+ passed and a unit is being enabled it
+ will also be restarted should it
+ already be running. If a unit is being
+ disabled it will be stopped should it
+ be running. In either case the
+ daemon configuration is
+ reloaded. <option>maybe</option> is
+ similar to this, but the unit will
+ also be started if it is being enabled
+ and any of the units listed in
+ <varname>WantedBy=</varname> in the
+ <literal>[Install]</literal> section
+ of the unit file is already
+ activated. Finally
+ <option>yes</option> starts the unit
+ unconditionally after enabling. This
+ setting defaults to
+ <option>no</option>. If the mode value
+ is omitted defaults to
+ <option>maybe</option>. This option
+ has no effect when
+ <option>--global</option> or
+ <command>test</command> is
+ used.</para></listitem>
+ </varlistentry>
</variablelist>
<para>The following commands are understood:</para>
@@ -130,17 +181,19 @@
<listitem><para>Enable a unit. This
will create a number of symlinks as
- encoded in the [Install] section of a
- unit file.</para></listitem>
+ encoded in the
+ <literal>[Install]</literal> section
+ of a unit file.</para></listitem>
</varlistentry>
<varlistentry>
<term><command>disable</command></term>
<listitem><para>Disable a unit. This
- will removed a number of symlinks as
- encoded in the [Install] section of a
- unit file.</para></listitem>
+ will remove a number of symlinks as
+ encoded in the
+ <literal>[Install]</literal> section
+ of a unit file.</para></listitem>
</varlistentry>
<varlistentry>
@@ -150,8 +203,9 @@
the units specified are
installed. This will check for the
existence of a number of symlinks as
- encoded in the [Install] section of a
- unit file.</para></listitem>
+ encoded in the
+ <literal>[Install]</literal> section
+ of a unit file.</para></listitem>
</varlistentry>
</variablelist>
commit 9a1ac7b9ae2fb218170d1bd106d5351a76d03a95
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jul 6 05:06:40 2010 +0200
install: implement --start option
diff --git a/Makefile.am b/Makefile.am
index d1ce02c..435f00d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,10 +219,6 @@ noinst_LTLIBRARIES = \
libsystemd-basic.la \
libsystemd-core.la
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs. We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-
libsystemd_basic_la_SOURCES = \
src/util.c \
src/hashmap.c \
@@ -293,6 +289,10 @@ libsystemd_core_la_LIBADD = \
$(LIBWRAP_LIBS) \
$(PAM_LIBS)
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs. We therefore can't
+# list the .h files as dependencies if we want make dist to work.
+
EXTRA_DIST += \
${libsystemd_basic_la_SOURCES:.c=.h} \
${libsystemd_core_la_SOURCES:.c=.h} \
@@ -304,8 +304,8 @@ EXTRA_DIST += \
src/linux/auto_dev-ioctl.h \
src/initreq.h \
src/sd-daemon.h \
- src/special.h
-
+ src/special.h \
+ src/dbus.common.h
MANPAGES = \
man/systemd.1 \
@@ -469,7 +469,8 @@ systemd_cgroups_agent_LDADD = \
systemctl_SOURCES = \
src/systemctl.c \
- src/utmp-wtmp.c
+ src/utmp-wtmp.c \
+ src/dbus-common.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
@@ -488,12 +489,13 @@ systemd_notify_LDADD = \
systemd_install_SOURCES = \
src/install.c \
- src/path-lookup.c
+ src/path-lookup.c \
+ src/dbus-common.c
systemd_install_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ $(DBUS_LIBS)
-# We don't really link here against D-Bus, however we indirectly include D-Bus header files
systemd_install_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
diff --git a/fixme b/fixme
index 1e27844..3fe23fd 100644
--- a/fixme
+++ b/fixme
@@ -35,12 +35,8 @@
* selinux
-* systemd-install disable sollte den service runterfahren, and daemon-reload machen
-
* systemctl daemon-reload is kaputt
-* Add missing man pages: update systemd.1, finish daemon.7
-
External:
* patch /etc/init.d/functions with:
diff --git a/src/dbus-common.c b/src/dbus-common.c
new file mode 100644
index 0000000..504eefb
--- /dev/null
+++ b/src/dbus-common.c
@@ -0,0 +1,83 @@
+/*-*- Mode: C; c-basic-offset: 8 -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <assert.h>
+#include <sys/socket.h>
+#include <errno.h>
+#include <unistd.h>
+#include <dbus/dbus.h>
+
+#include "log.h"
+#include "dbus-common.h"
+
+int bus_check_peercred(DBusConnection *c) {
+ int fd;
+ struct ucred ucred;
+ socklen_t l;
+
+ assert(c);
+
+ assert_se(dbus_connection_get_unix_fd(c, &fd));
+
+ l = sizeof(struct ucred);
+ if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &l) < 0) {
+ log_error("SO_PEERCRED failed: %m");
+ return -errno;
+ }
+
+ if (l != sizeof(struct ucred)) {
+ log_error("SO_PEERCRED returned wrong size.");
+ return -E2BIG;
+ }
+
+ if (ucred.uid != 0)
+ return -EPERM;
+
+ return 1;
+}
+
+int bus_connect(DBusBusType t, DBusConnection **_bus, DBusError *error) {
+ DBusConnection *bus;
+
+ assert(_bus);
+
+ /* If we are root, then let's not go via the bus */
+ if (geteuid() == 0 && t == DBUS_BUS_SYSTEM) {
+
+ if (!(bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", error)))
+ return -EIO;
+
+ if (bus_check_peercred(bus) < 0) {
+ dbus_connection_unref(bus);
+
+ dbus_set_error_const(error, DBUS_ERROR_ACCESS_DENIED, "Failed to verify owner of bus.");
+ return -EACCES;
+ }
+ } else {
+ if (!(bus = dbus_bus_get(t, error)))
+ return -EIO;
+ }
+
+ dbus_connection_set_exit_on_disconnect(bus, FALSE);
+
+ *_bus = bus;
+ return 0;
+}
diff --git a/src/dbus-common.h b/src/dbus-common.h
new file mode 100644
index 0000000..f355de1
--- /dev/null
+++ b/src/dbus-common.h
@@ -0,0 +1,31 @@
+/*-*- Mode: C; c-basic-offset: 8 -*-*/
+
+#ifndef foodbuscommonhfoo
+#define foodbuscommonhfoo
+
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <dbus/dbus.h>
+
+int bus_check_peercred(DBusConnection *c);
+
+int bus_connect(DBusBusType t, DBusConnection **_bus, DBusError *error);
+
+#endif
diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 704e5fa..f2a7de7 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -56,6 +56,11 @@
" <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"job\" type=\"o\" direction=\"out\"/>\n" \
" </method>\n" \
+ " <method name=\"TryRestartUnit\">\n" \
+ " <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
+ " <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n" \
+ " <arg name=\"job\" type=\"o\" direction=\"out\"/>\n" \
+ " </method>\n" \
" <method name=\"GetJob\">\n" \
" <arg name=\"id\" type=\"u\" direction=\"in\"/>\n" \
" <arg name=\"job\" type=\"o\" direction=\"out\"/>\n" \
@@ -287,6 +292,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
job_type = JOB_RELOAD;
else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "RestartUnit"))
job_type = JOB_RESTART;
+ else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "TryRestartUnit"))
+ job_type = JOB_TRY_RESTART;
else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "GetJob")) {
uint32_t id;
Job *j;
diff --git a/src/dbus-unit.c b/src/dbus-unit.c
index 1f74a2a..63301a0 100644
--- a/src/dbus-unit.c
+++ b/src/dbus-unit.c
@@ -272,6 +272,8 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *conn
job_type = JOB_RELOAD;
else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Restart"))
job_type = JOB_RESTART;
+ else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "TryRestart"))
+ job_type = JOB_TRY_RESTART;
else if (UNIT_VTABLE(u)->bus_message_handler)
return UNIT_VTABLE(u)->bus_message_handler(u, connection, message);
else
diff --git a/src/dbus-unit.h b/src/dbus-unit.h
index 7babb23..2067095 100644
--- a/src/dbus-unit.h
+++ b/src/dbus-unit.h
@@ -40,6 +40,10 @@
" <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"job\" type=\"o\" direction=\"out\"/>\n" \
" </method>\n" \
+ " <method name=\"TryRestart\">\n" \
+ " <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n" \
+ " <arg name=\"job\" type=\"o\" direction=\"out\"/>\n" \
+ " </method>\n" \
" <method name=\"Reload\">\n" \
" <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"job\" type=\"o\" direction=\"out\"/>\n" \
diff --git a/src/install.c b/src/install.c
index f56c072..3bf5761 100644
--- a/src/install.c
+++ b/src/install.c
@@ -31,6 +31,7 @@
#include "macro.h"
#include "strv.h"
#include "conf-parser.h"
+#include "dbus-common.h"
static bool arg_force = false;
@@ -47,6 +48,13 @@ static enum {
ACTION_TEST
} arg_action = ACTION_INVALID;
+static enum {
+ START_NO, /* Don't start/stop or anything */
+ START_MINIMAL, /* Only shutdown/restart if running. */
+ START_MAYBE, /* Start if WantedBy= suggests */
+ START_YES /* Start unconditionally */
+} arg_start = START_NO;
+
typedef struct {
char *name;
char *path;
@@ -61,11 +69,13 @@ static int help(void) {
printf("%s [OPTIONS...] {COMMAND} ...\n\n"
"Install init system units.\n\n"
- " -h --help Show this help\n"
- " --force Override existing links\n"
- " --system Install into system\n"
- " --session Install into session\n"
- " --global Install into all sessions\n\n"
+ " -h --help Show this help\n"
+ " --force Override existing links\n"
+ " --system Install into system\n"
+ " --session Install into session\n"
+ " --global Install into all sessions\n"
+ " --start[=MODE] Start/stop/restart unit after installation\n"
+ " Takes 'no', 'minimal', 'maybe' or 'yes'\n\n"
"Commands:\n"
" enable [NAME...] Enable one or more units\n"
" disable [NAME...] Disable one or more units\n"
@@ -81,7 +91,8 @@ static int parse_argv(int argc, char *argv[]) {
ARG_SESSION = 0x100,
ARG_SYSTEM,
ARG_GLOBAL,
- ARG_FORCE
+ ARG_FORCE,
+ ARG_START
};
static const struct option options[] = {
@@ -90,6 +101,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "system", no_argument, NULL, ARG_SYSTEM },
{ "global", no_argument, NULL, ARG_GLOBAL },
{ "force", no_argument, NULL, ARG_FORCE },
+ { "start", optional_argument, NULL, ARG_START },
{ NULL, 0, NULL, 0 }
};
@@ -122,6 +134,25 @@ static int parse_argv(int argc, char *argv[]) {
arg_force = true;
break;
+ case ARG_START:
+
+ if (!optarg)
+ arg_start = START_MAYBE;
+ else if (streq(optarg, "no"))
+ arg_start = START_NO;
+ else if (streq(optarg, "minimal"))
+ arg_start = START_MINIMAL;
+ else if (streq(optarg, "maybe"))
+ arg_start = START_MAYBE;
+ else if (streq(optarg, "yes"))
+ arg_start = START_YES;
+ else {
+ log_error("Invalid --start argument %s", optarg);
+ return -EINVAL;
+ }
+
+ break;
+
case '?':
return -EINVAL;
@@ -154,6 +185,7 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
+
return 1;
}
@@ -223,6 +255,225 @@ fail:
return r;
}
+static int daemon_reload(DBusConnection *bus) {
+ DBusMessage *m = NULL, *reply = NULL;
+ DBusError error;
+ int r;
+
+ assert(bus);
+
+ dbus_error_init(&error);
+
+ if (!(m = dbus_message_new_method_call(
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "Reload"))) {
+ log_error("Could not allocate message.");
+ return -ENOMEM;
+ }
+
+ if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+ log_error("Failed to reload configuration: %s", error.message);
+ r = -EIO;
+ goto finish;
+ }
+
+ r = 0;
+
+finish:
+ if (m)
+ dbus_message_unref(m);
+
+ if (reply)
+ dbus_message_unref(reply);
+
+ dbus_error_free(&error);
+
+ return r;
+}
+
+static int install_info_run(DBusConnection *bus, InstallInfo *i) {
+ DBusMessage *m = NULL, *reply = NULL;
+ DBusError error;
+ int r;
+ const char *mode = "replace";
+
+ assert(bus);
+ assert(i);
+
+ dbus_error_init(&error);
+
+ if (arg_action == ACTION_ENABLE) {
+
+ if (arg_start == START_MAYBE) {
+ char **k;
+ bool yes_please = false;
+
+ STRV_FOREACH(k, i->wanted_by) {
+ DBusMessageIter sub, iter;
+
+ const char *path, *state;
+ const char *interface = "org.freedesktop.systemd1.Unit";
+ const char *property = "ActiveState";
+
+ if (!(m = dbus_message_new_method_call(
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "GetUnit"))) {
+ log_error("Could not allocate message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_STRING, k,
+ DBUS_TYPE_INVALID)) {
+ log_error("Could not append arguments to message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+ /* Hmm, this unit doesn't exist, let's try the next one */
+ dbus_message_unref(m);
+ m = NULL;
+ continue;
+ }
+
+ if (!dbus_message_get_args(reply, &error,
+ DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID)) {
+ log_error("Failed to parse reply: %s", error.message);
+ r = -EIO;
+ goto finish;
+ }
+
+ dbus_message_unref(m);
+ if (!(m = dbus_message_new_method_call(
+ "org.freedesktop.systemd1",
+ path,
+ "org.freedesktop.DBus.Properties",
+ "Get"))) {
+ log_error("Could not allocate message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_STRING, &interface,
+ DBUS_TYPE_STRING, &property,
+ DBUS_TYPE_INVALID)) {
+ log_error("Could not append arguments to message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ dbus_message_unref(reply);
+ if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+ log_error("Failed to issue method call: %s", error.message);
+ r = -EIO;
+ goto finish;
+ }
+
+ if (!dbus_message_iter_init(reply, &iter) ||
+ dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
+ log_error("Failed to parse reply.");
+ r = -EIO;
+ goto finish;
+ }
+
+ dbus_message_iter_recurse(&iter, &sub);
+
+ if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) {
+ log_error("Failed to parse reply.");
+ r = -EIO;
+ goto finish;
+ }
+
+ dbus_message_iter_get_basic(&sub, &state);
+
+ dbus_message_unref(m);
+ dbus_message_unref(reply);
+ m = reply = NULL;
+
+ if (streq(state, "active") ||
+ startswith(state, "reloading") ||
+ startswith(state, "activating")) {
+ yes_please = true;
+ break;
+ }
+ }
+
+ if (!yes_please) {
+ r = 0;
+ goto finish;
+ }
+ }
+
+ if (!(m = dbus_message_new_method_call(
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ arg_start == START_MINIMAL ? "TryRestartUnit" : "RestartUnit"))) {
+ log_error("Could not allocate message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_STRING, &i->name,
+ DBUS_TYPE_STRING, &mode,
+ DBUS_TYPE_INVALID)) {
+ log_error("Could not append arguments to message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+
+ } else if (arg_action == ACTION_DISABLE) {
+
+ if (!(m = dbus_message_new_method_call(
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "StopUnit"))) {
+ log_error("Could not allocate message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (!dbus_message_append_args(m,
+ DBUS_TYPE_STRING, &i->name,
+ DBUS_TYPE_STRING, &mode,
+ DBUS_TYPE_INVALID)) {
+ log_error("Could not append arguments to message.");
+ r = -ENOMEM;
+ goto finish;
+ }
+ }
+
+ if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
+ log_error("Failed to reload configuration: %s", error.message);
+ r = -EIO;
+ goto finish;
+ }
+
+ r = 0;
+
+finish:
+ if (m)
+ dbus_message_unref(m);
+
+ if (reply)
+ dbus_message_unref(reply);
+
+ dbus_error_free(&error);
+
+ return r;
+}
+
static int config_parse_also(
const char *filename,
unsigned line,
@@ -518,6 +769,57 @@ static char *get_config_path(void) {
}
}
+static int do_run(void) {
+ DBusConnection *bus = NULL;
+ DBusError error;
+ int r, q;
+ Iterator i;
+ InstallInfo *j;
+
+ dbus_error_init(&error);
+
+ if (arg_start == START_NO)
+ return 0;
+
+ if (arg_where == WHERE_GLOBAL) {
+ log_warning("Warning: --start has no effect with --global.");
+ return 0;
+ }
+
+ if (arg_action != ACTION_ENABLE && arg_action != ACTION_DISABLE) {
+ log_warning("Warning: --start has no effect with test.");
+ return 0;
+ }
+
+ if ((r = bus_connect(arg_where == WHERE_SESSION ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &bus, &error)) < 0) {
+ log_error("Failed to get D-Bus connection: %s", error.message);
+ goto finish;
+ }
+
+ r = 0;
+
+ if (arg_action == ACTION_ENABLE)
+ if ((r = daemon_reload(bus)) < 0)
+ goto finish;
+
+ HASHMAP_FOREACH(j, have_installed, i)
+ if ((q = install_info_run(bus, j)) < 0)
+ r = q;
+
+ if (arg_action == ACTION_DISABLE)
+ if ((q = daemon_reload(bus)) < 0)
+ r = q;
+
+finish:
+ if (bus)
+ dbus_connection_unref(bus);
+
+ dbus_error_free(&error);
+
+ dbus_shutdown();
+ return r;
+}
+
int main(int argc, char *argv[]) {
int r, retval = 1, j;
LookupPaths paths;
@@ -571,6 +873,9 @@ int main(int argc, char *argv[]) {
}
}
+ if (do_run() < 0)
+ goto finish;
+
retval = arg_action == ACTION_TEST ? 1 : 0;
finish:
diff --git a/src/systemctl.c b/src/systemctl.c
index 76f6b84..73b0fc4 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -41,6 +41,7 @@
#include "special.h"
#include "initreq.h"
#include "strv.h"
+#include "dbus-common.h"
static const char *arg_type = NULL;
static const char *arg_property = NULL;
@@ -106,32 +107,6 @@ static int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *da
return 0;
}
-static int bus_check_peercred(DBusConnection *c) {
- int fd;
- struct ucred ucred;
- socklen_t l;
-
- assert(c);
-
- assert_se(dbus_connection_get_unix_fd(c, &fd));
-
- l = sizeof(struct ucred);
- if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &l) < 0) {
- log_error("SO_PEERCRED failed: %m");
- return -errno;
- }
-
- if (l != sizeof(struct ucred)) {
- log_error("SO_PEERCRED returned wrong size.");
- return -E2BIG;
- }
-
- if (ucred.uid != 0)
- return -EPERM;
-
- return 1;
-}
-
static int columns(void) {
static int parsed_columns = 0;
const char *e;
@@ -3264,19 +3239,7 @@ int main(int argc, char*argv[]) {
goto finish;
}
- /* If we are root, then let's not go via the bus */
- if (geteuid() == 0 && !arg_session) {
- bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &error);
-
- if (bus && bus_check_peercred(bus) < 0) {
- log_error("Failed to verify owner of bus.");
- goto finish;
- }
- } else
- bus = dbus_bus_get(arg_session ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error);
-
- if (bus)
- dbus_connection_set_exit_on_disconnect(bus, FALSE);
+ bus_connect(arg_session ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &bus, &error);
switch (arg_action) {
More information about the systemd-commits
mailing list