diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | man/systemd.service.xml | 2 | ||||
| -rw-r--r-- | man/systemd.special.xml.in | 23 | ||||
| -rw-r--r-- | src/service.c | 2 | ||||
| -rw-r--r-- | src/special.h | 37 | ||||
| -rw-r--r-- | units/dbus.target | 11 |
6 files changed, 22 insertions, 54 deletions
diff --git a/Makefile.am b/Makefile.am index 8d2343038e..a94d2a7f7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -229,7 +229,6 @@ dist_systemunit_DATA = \ units/sigpwr.target \ units/sockets.target \ units/swap.target \ - units/dbus.target \ units/systemd-initctl.socket \ units/systemd-logger.socket \ units/systemd-shutdownd.socket \ diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 7200525c03..e444efeb44 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -180,7 +180,7 @@ acquired. Service units with this option configured implicitly gain dependencies on the - <filename>dbus.target</filename> + <filename>dbus.socket</filename> unit.</para> <para>Behaviour of diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index afe882e51f..1506f34948 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -51,7 +51,6 @@ <para><filename>basic.target</filename>, <filename>ctrl-alt-del.target</filename>, <filename>dbus.service</filename>, - <filename>dbus.target</filename>, <filename>default.target</filename>, <filename>display-manager.service</filename>, <filename>emergency.target</filename>, @@ -143,28 +142,6 @@ up systemd will connect to it and register its service.</para> - - <para>Units should generally - avoid depending on this unit - directly and instead refer to - the - <filename>dbus.target</filename> - unit instead, which pulls this - one in directly or indirectly - via socket-based activation.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><filename>dbus.target</filename></term> - <listitem> - <para>Administrators should - ensure that this target pulls - in a service unit with the - name or alias of - <filename>dbus.service</filename> - (or a socket unit that - activates this - service).</para> </listitem> </varlistentry> <varlistentry> diff --git a/src/service.c b/src/service.c index 0f28312b38..f0c72f2c27 100644 --- a/src/service.c +++ b/src/service.c @@ -1129,7 +1129,7 @@ static int service_load(Unit *u) { s->notify_access = NOTIFY_MAIN; if (s->type == SERVICE_DBUS || s->bus_name) - if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_TARGET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true)) < 0) return r; if (s->meta.default_dependencies) diff --git a/src/special.h b/src/special.h index 2f2d9e7b24..ba2bc143e0 100644 --- a/src/special.h +++ b/src/special.h @@ -30,17 +30,24 @@ * system shutdown. */ #define SPECIAL_SHUTDOWN_TARGET "shutdown.target" #define SPECIAL_UMOUNT_TARGET "umount.target" +#define SPECIAL_HALT_TARGET "halt.target" +#define SPECIAL_POWEROFF_TARGET "poweroff.target" +#define SPECIAL_REBOOT_TARGET "reboot.target" +#define SPECIAL_KEXEC_TARGET "kexec.target" +#define SPECIAL_EXIT_TARGET "exit.target" -#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket" - -#define SPECIAL_KBREQUEST_TARGET "kbrequest.target" -#define SPECIAL_SIGPWR_TARGET "sigpwr.target" -#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target" +#define SPECIAL_RESCUE_TARGET "rescue.target" +#define SPECIAL_EMERGENCY_TARGET "emergency.target" +#define SPECIAL_SYSINIT_TARGET "sysinit.target" +#define SPECIAL_SOCKETS_TARGET "sockets.target" #define SPECIAL_LOCAL_FS_TARGET "local-fs.target" /* LSB's $local_fs */ #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target" /* LSB's $remote_fs */ #define SPECIAL_SWAP_TARGET "swap.target" +#define SPECIAL_BASIC_TARGET "basic.target" + #define SPECIAL_NETWORK_TARGET "network.target" /* LSB's $network */ + #define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */ #define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */ #define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog; Should pull in syslog.socket or syslog.service */ @@ -48,22 +55,18 @@ #define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Debian's $x-display-manager */ #define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */ #define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target" -#define SPECIAL_DBUS_TARGET "dbus.target" -#define SPECIAL_BASIC_TARGET "basic.target" -#define SPECIAL_SOCKETS_TARGET "sockets.target" -#define SPECIAL_SYSINIT_TARGET "sysinit.target" + #define SPECIAL_FSCK_SERVICE "fsck@.service" #define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service" -#define SPECIAL_RESCUE_TARGET "rescue.target" -#define SPECIAL_EXIT_TARGET "exit.target" -#define SPECIAL_EMERGENCY_TARGET "emergency.target" -#define SPECIAL_HALT_TARGET "halt.target" -#define SPECIAL_POWEROFF_TARGET "poweroff.target" -#define SPECIAL_REBOOT_TARGET "reboot.target" -#define SPECIAL_KEXEC_TARGET "kexec.target" +#define SPECIAL_REMOUNT_ROOTFS_SERVICE "remount-rootfs.service" + #define SPECIAL_DBUS_SERVICE "dbus.service" #define SPECIAL_DBUS_SOCKET "dbus.socket" -#define SPECIAL_REMOUNT_ROOTFS_SERVICE "remount-rootfs.service" +#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket" + +#define SPECIAL_KBREQUEST_TARGET "kbrequest.target" +#define SPECIAL_SIGPWR_TARGET "sigpwr.target" +#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target" #ifndef SPECIAL_SYSLOG_SERVICE #define SPECIAL_SYSLOG_SERVICE "syslog.service" diff --git a/units/dbus.target b/units/dbus.target deleted file mode 100644 index 63897685c2..0000000000 --- a/units/dbus.target +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of systemd. -# -# 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. - -# See systemd.special(7) for details - -[Unit] -Description=D-Bus |