units: update shipped unit files for DefaultDependencies=

diff --git a/Makefile.am b/Makefile.am
index 013f424f7175edacfe725b9aa1e69b78ea24132d..d1ce02c849c7a9ab3e7b0b553e6ce4fe2ab1f099 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,8 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
-       units/syslog.target
+       units/syslog.target \
+       units/dbus.target
 
 dist_sessionunit_DATA = \
        units/session/default.target
@@ -164,6 +165,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
+       units/dbus.target.in \
        units/session/exit.service.in \
        systemd.pc.in
 
@@ -738,8 +740,8 @@ if TARGET_FEDORA
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) ../display-manager.service display-manager.service )
+               rm -f prefdm.service && \
+               $(LN_S) ../prefdm.service prefdm.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
@@ -754,8 +756,8 @@ if TARGET_GENTOO
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) ../display-manager.service display-manager.service )
+               rm -f prefdm.service && \
+               $(LN_S) ../prefdm.service prefdm.service )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \

diff --git a/units/.gitignore b/units/.gitignore
index ea85dc081e08de6f78f4e179e27bdaf6226c4c39..75d3bfd0e93e291a59f7da4a1050b154bae87cad 100644 (file)
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -6,3 +6,4 @@ graphical.target
 multi-user.target
 getty@.service
 remote-fs.target
+dbus.target

diff --git a/units/arch/halt.service b/units/arch/halt.service
index 445ca48d4400b0fc2469cb914fdc13efc7b13f64..96553f1ad4e6d557e9ccb20fe71fc1dcd3ba5e01 100644 (file)
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Halt
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service
index 3ca8f30e94c8b35c5c96788e13efa22818b8c4ac..d6e42e1a4b7b4d2e5d98b5e7c5e4570e308d6432 100644 (file)
--- a/units/arch/poweroff.service
+++ b/units/arch/poweroff.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Power-Off
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/arch/rc-local.service b/units/arch/rc-local.service
index 45b6e1648318bb52b2a3c3b16a6e54f0bb04cb53..596861ac95b63fe20bd5475194b0d9d2a0bdb7de 100644 (file)
--- a/units/arch/rc-local.service
+++ b/units/arch/rc-local.service
@@ -7,10 +7,6 @@
 
 [Unit]
 Description=/etc/rc.local Compatibility
-Requires=basic.target
-After=basic.target
-Conflicts=shutdown.target
-Before=getty@tty1.service
 
 [Service]
 ExecStart=/etc/rc.local
@@ -18,3 +14,6 @@ ExectStop=/etc/rc.local.shutdown
 TimeoutSec=0
 StandardInput=tty
 ValidNoProcess=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/units/arch/reboot.service b/units/arch/reboot.service
index 4aa7dc2e813af226c995b1420735d6463b012184..b2c18842fff11dcd89f7aaf32713c7b354266364 100644 (file)
--- a/units/arch/reboot.service
+++ b/units/arch/reboot.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Reboot
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/arch/sysinit.service b/units/arch/sysinit.service
index 8be50d784b8c637d7b62e4db332ae08501784122..1a19baf2f667dc5d1d960aaeb2cfba7eaa15524f 100644 (file)
--- a/units/arch/sysinit.service
+++ b/units/arch/sysinit.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=System Initialization
+DefaultDependencies=no
 Before=local-fs.target remote-fs.target swap.target sockets.target
 Conflicts=shutdown.target
 Before=shutdown.target

diff --git a/units/dbus.target.in b/units/dbus.target.in
new file mode 100644 (file)
index 0000000..6faf58d
--- /dev/null
+++ b/units/dbus.target.in
@@ -0,0 +1,17 @@
+#  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
+
+# As soon as D-Bus has native files this explicit dependency should be
+# dropped, and replaced by an alias symlink in the .wants/ directory,
+# to either the .service or .socket unit of the D-Bus service.
+Requires=@SPECIAL_DBUS_SERVICE@
+After=@SPECIAL_DBUS_SERVICE@

diff --git a/units/emergency.service b/units/emergency.service
index 924723fefede74b2fe1a98653aa5cf781b4477d7..83b7d72b7b7da7af76018ce27efe00500d50ac59 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=Emergency Shell
+DefaultDependencies=no
 
 [Service]
 ExecStart=/bin/sh

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 50373d48b6455193774302a72f992be6f749278f..815c8fbdad23428545f8363e6cd760c4f8563047 100644 (file)
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Halt
+DefaultDependencies=no
 Requires=shutdown.target killall.service
 After=shutdown.target killall.service
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 84c56cb8d3fb83f72b1b008b6787f820dbbb8509..8ccbbcea8e9ab4b97c936d437b728f0a74f18fba 100644 (file)
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Kill All Processes
+DefaultDependencies=no
 After=shutdown.target
 OnlyByDependency=yes
 

diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index f237e327193b177c0c1db6954da33415f655ef0c..2149dbf6db725b6c44a7fdef0044c719e2fe3f62 100644 (file)
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Power-Off
+DefaultDependencies=no
 Requires=shutdown.target killall.service
 After=shutdown.target killall.service
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 2f4333f3c07411c5320f6f37e2ef7bd3be17838b..89a96be1c8885b4080b6f2235a3b8f557ebb4982 100644 (file)
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -7,13 +7,11 @@
 
 [Unit]
 Description=Display Manager
-Before=graphical.target
-Requires=basic.target
-After=basic.target syslog.target messagebus.service haldaemon.service
-Conflicts=shutdown.target
+After=syslog.target dbus.target haldaemon.service
 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon
 
 [Install]
 Alias=display-manager.service
+WantedBy=graphical.target

diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index 58b59820e26555c841a946b34e21ac5342b1f2a9..c2d2e00fd77ad0a095132b3243198ce5efd4eb17 100644 (file)
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -7,10 +7,6 @@
 
 [Unit]
 Description=/etc/rc.local Compatibility
-Requires=basic.target
-After=basic.target
-Conflicts=shutdown.target
-Before=getty@tty1.service
 
 # The rcN.d symlink uses the name "local" while the script itself is
 # called "rc.local", hence carry both names here.
@@ -22,3 +18,6 @@ TimeoutSec=0
 StandardInput=tty
 ValidNoProcess=yes
 SysVStartPriority=99
+
+[Install]
+WantedBy=multi-user.target

diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index b99dfdc8ac47556fd1c5609657d185c277c8142c..31aa74e1418fb0e671f69bb06b31bf8dd498afab 100644 (file)
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Reboot
+DefaultDependencies=no
 Requires=shutdown.target killall.service
 After=shutdown.target killall.service
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service
index 5981552da93a851e11103d0436d74d2ebb0d42e8..884de8d1d636424debb95b73f33740fd9a1dc713 100644 (file)
--- a/units/fedora/sysinit.service
+++ b/units/fedora/sysinit.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=System Initialization
+DefaultDependencies=no
 Before=local-fs.target remote-fs.target swap.target sockets.target
 Conflicts=shutdown.target
 Before=shutdown.target

diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index c5d96043c04059812ef7c37f5548855df24fd4f6..ecf4cff4f58b8af5b246de1acc4e45920dec1def 100644 (file)
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Halt
+DefaultDependencies=no
 Requires=shutdown.target killall.service
 After=shutdown.target killall.service
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/gentoo/killall.service b/units/gentoo/killall.service
index 626e9d1f683734420e0b6a6ae8d30d4d6491460b..ce4d99ef2e5f6f5a7b79deb4a85e1931b3d9856b 100644 (file)
--- a/units/gentoo/killall.service
+++ b/units/gentoo/killall.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Kill All Processes
+DefaultDependencies=no
 After=shutdown.target
 OnlyByDependency=yes
 

diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 2cc645ec5302be14fc9ab00bfbb463fd3166b360..2ae1fd7f29401ae0bc746782be4904b8c99b9416 100644 (file)
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Power-Off
+DefaultDependencies=no
 Requires=shutdown.target killall.service
 After=shutdown.target killall.service
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index fdca6f866ea0d7274a6ab99c50723ce8c2ec2ef5..353fb4bfcb96f3d874d4403d26b13ee13061194f 100644 (file)
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Reboot
+DefaultDependencies=no
 Requires=shutdown.target killall.service
 After=shutdown.target killall.service
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
index ac1df757223daa904c317da82850042e1d132a0f..b94c6a8c0ab6437e0911a81f10ad0bbd4d663346 100644 (file)
--- a/units/gentoo/xdm.service
+++ b/units/gentoo/xdm.service
@@ -7,10 +7,11 @@
 
 [Unit]
 Description=Display Manager
-Before=graphical.target
-Requires=basic.target
-After=basic.target syslog.target dbus.service hald.service
-Conflicts=shutdown.target
+After=syslog.target dbus.target hald.service
 
 [Service]
 ExecStart=/etc/init.d/xdm start
+
+[Install]
+Alias=display-manager.service
+WantedBy=graphical.target

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 5f6944fadbe8dc8c0031889d8fc5b1a426dfa38c..f1f7f326304b9e12777755f49883665643688cd5 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -14,8 +14,12 @@ m4_dnl
 [Unit]
 Description=Getty on %I
 Before=getty.target
-After=basic.target
-Conflicts=shutdown.target
+m4_ifdef(`TARGET_FEDORA',
+After=rc-local.service
+)m4_dnl
+m4_ifdef(`TARGET_ARCH',
+After=rc-local.service
+)m4_dnl
 
 [Service]
 Environment=TERM=linux

diff --git a/units/session/exit.service.in b/units/session/exit.service.in
index 86c8bbc6723e6f51fdbe1b265936952b5e975c15..1f515a75cedbf15701b9a61737cc3be85d0bfcb0 100644 (file)
--- a/units/session/exit.service.in
+++ b/units/session/exit.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Exit
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 

diff --git a/units/suse/halt.service b/units/suse/halt.service
index bc237f02f0244fa2b1cd0c7e528adc4c1eb198a7..fbcf154f578a4d5205babc52faa67222c1a09a69 100644 (file)
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Halt
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index a68c10cfd3794b14954a4110f5766b1904829e49..3da6cf1ba525ef8722cd046c967f72fc0ebc5ba0 100644 (file)
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Power-Off
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index 3dbb469117992dfe49cfbc42a3f96150cda37600..902648c50b8d9cce74c4280e2e05e669319dab47 100644 (file)
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Reboot
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount

diff --git a/units/syslog.target.in b/units/syslog.target.in
index 3057eda3cce7438491f00b228fd7b3dd8f97e3c4..b9c4f18c35a13b884eabfc490075660f952f3598 100644 (file)
--- a/units/syslog.target.in
+++ b/units/syslog.target.in
@@ -9,5 +9,10 @@
 
 [Unit]
 Description=Syslog
+
+# As soon as all syslog services have native unit files this explicit
+# dependency should be dropped, and replaced by alias symlinks in the
+# .wants/ directory, to either the .service or .socket unit of the
+# syslog service.
 Requires=@SPECIAL_SYSLOG_SERVICE@
 After=@SPECIAL_SYSLOG_SERVICE@

diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 7450e07e61375656a14b3ed05f5167a9f931f7bb..6d56e12bf370d7b3e3d57f5b068cd5fdde49ce3e 100644 (file)
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd /dev/initctl Compatibility Daemon
+DefaultDependencies=no
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-initctl

diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket
index 26b526cdcb63015c39e955cb46051bf85d7991d0..3db2683f6b50dd8b3008bcb7a9a5d6ef97d4caa1 100644 (file)
--- a/units/systemd-initctl.socket
+++ b/units/systemd-initctl.socket
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd /dev/initctl Compatibility Socket
+DefaultDependencies=no
 After=sysinit.target
 Before=sockets.target
 

diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 200443897151e76fc6f1fadbb15aa66607e6e59c..2a9ec21067d516cd4abe9c576f77a9e9401caa7c 100644 (file)
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd Logging Daemon
+DefaultDependencies=no
 After=@SPECIAL_SYSLOG_SERVICE@
 
 [Service]

diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket
index 44684ce1d0e3cf5249ad2df5a5586e84163c2701..57a590dba95036e0b7019dfd833ab0806e60b86d 100644 (file)
--- a/units/systemd-logger.socket
+++ b/units/systemd-logger.socket
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd Logging Socket
+DefaultDependencies=no
 After=sysinit.target
 Before=sockets.target