units: update shipped unit files for DefaultDependencies=

2024-12-22 17:35:35 +03:00 · 2010-07-03 19:53:37 +02:00 · 2010-07-03 19:53:37 +02:00 · af65a09126
commit af65a09126
parent daf32cc791
31 changed files with 71 additions and 23 deletions
--- 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 = \
--- a/units/.gitignore
+++ b/units/.gitignore
@ -6,3 +6,4 @@ graphical.target
 multi-user.target
 getty@.service
 remote-fs.target
+dbus.target
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/units/dbus.target.in
+++ 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@
--- a/units/emergency.service
+++ b/units/emergency.service
@ -9,6 +9,7 @@

 [Unit]
 Description=Emergency Shell
+DefaultDependencies=no

 [Service]
 ExecStart=/bin/sh
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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@
--- 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
--- 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

--- 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]
--- 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