chiark / gitweb /
units: update shipped unit files for DefaultDependencies=
authorLennart Poettering <lennart@poettering.net>
Sat, 3 Jul 2010 17:53:37 +0000 (19:53 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 3 Jul 2010 17:53:37 +0000 (19:53 +0200)
31 files changed:
Makefile.am
units/.gitignore
units/arch/halt.service
units/arch/poweroff.service
units/arch/rc-local.service
units/arch/reboot.service
units/arch/sysinit.service
units/dbus.target.in [new file with mode: 0644]
units/emergency.service
units/fedora/halt.service
units/fedora/killall.service
units/fedora/poweroff.service
units/fedora/prefdm.service
units/fedora/rc-local.service
units/fedora/reboot.service
units/fedora/sysinit.service
units/gentoo/halt.service
units/gentoo/killall.service
units/gentoo/poweroff.service
units/gentoo/reboot.service
units/gentoo/xdm.service
units/getty@.service.m4
units/session/exit.service.in
units/suse/halt.service
units/suse/poweroff.service
units/suse/reboot.service
units/syslog.target.in
units/systemd-initctl.service.in
units/systemd-initctl.socket
units/systemd-logger.service.in
units/systemd-logger.socket

index 013f424..d1ce02c 100644 (file)
@@ -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 = \
index ea85dc0..75d3bfd 100644 (file)
@@ -6,3 +6,4 @@ graphical.target
 multi-user.target
 getty@.service
 remote-fs.target
+dbus.target
index 445ca48..96553f1 100644 (file)
@@ -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
index 3ca8f30..d6e42e1 100644 (file)
@@ -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
index 45b6e16..596861a 100644 (file)
@@ -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
index 4aa7dc2..b2c1884 100644 (file)
@@ -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
index 8be50d7..1a19baf 100644 (file)
@@ -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
@@ -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@
index 924723f..83b7d72 100644 (file)
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=Emergency Shell
+DefaultDependencies=no
 
 [Service]
 ExecStart=/bin/sh
index 50373d4..815c8fb 100644 (file)
@@ -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
index 84c56cb..8ccbbce 100644 (file)
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Kill All Processes
+DefaultDependencies=no
 After=shutdown.target
 OnlyByDependency=yes
 
index f237e32..2149dbf 100644 (file)
@@ -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
index 2f4333f..89a96be 100644 (file)
@@ -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
index 58b5982..c2d2e00 100644 (file)
@@ -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
index b99dfdc..31aa74e 100644 (file)
@@ -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
index 5981552..884de8d 100644 (file)
@@ -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
index c5d9604..ecf4cff 100644 (file)
@@ -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
index 626e9d1..ce4d99e 100644 (file)
@@ -7,6 +7,7 @@
 
 [Unit]
 Description=Kill All Processes
+DefaultDependencies=no
 After=shutdown.target
 OnlyByDependency=yes
 
index 2cc645e..2ae1fd7 100644 (file)
@@ -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
index fdca6f8..353fb4b 100644 (file)
@@ -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
index ac1df75..b94c6a8 100644 (file)
@@ -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
index 5f6944f..f1f7f32 100644 (file)
@@ -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
index 86c8bbc..1f515a7 100644 (file)
@@ -1,5 +1,6 @@
 [Unit]
 Description=Exit
+DefaultDependencies=no
 Requires=shutdown.target
 After=shutdown.target
 
index bc237f0..fbcf154 100644 (file)
@@ -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
index a68c10c..3da6cf1 100644 (file)
@@ -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
index 3dbb469..902648c 100644 (file)
@@ -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
index 3057eda..b9c4f18 100644 (file)
@@ -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@
index 7450e07..6d56e12 100644 (file)
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd /dev/initctl Compatibility Daemon
+DefaultDependencies=no
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-initctl
index 26b526c..3db2683 100644 (file)
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd /dev/initctl Compatibility Socket
+DefaultDependencies=no
 After=sysinit.target
 Before=sockets.target
 
index 2004438..2a9ec21 100644 (file)
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd Logging Daemon
+DefaultDependencies=no
 After=@SPECIAL_SYSLOG_SERVICE@
 
 [Service]
index 44684ce..57a590d 100644 (file)
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=systemd Logging Socket
+DefaultDependencies=no
 After=sysinit.target
 Before=sockets.target