units: update shipped unit files for DefaultDependencies=
This commit is contained in:
parent
daf32cc791
commit
af65a09126
12
Makefile.am
12
Makefile.am
|
@ -146,7 +146,8 @@ nodist_systemunit_DATA = \
|
||||||
units/multi-user.target \
|
units/multi-user.target \
|
||||||
units/systemd-initctl.service \
|
units/systemd-initctl.service \
|
||||||
units/systemd-logger.service \
|
units/systemd-logger.service \
|
||||||
units/syslog.target
|
units/syslog.target \
|
||||||
|
units/dbus.target
|
||||||
|
|
||||||
dist_sessionunit_DATA = \
|
dist_sessionunit_DATA = \
|
||||||
units/session/default.target
|
units/session/default.target
|
||||||
|
@ -164,6 +165,7 @@ EXTRA_DIST = \
|
||||||
units/systemd-initctl.service.in \
|
units/systemd-initctl.service.in \
|
||||||
units/systemd-logger.service.in \
|
units/systemd-logger.service.in \
|
||||||
units/syslog.target.in \
|
units/syslog.target.in \
|
||||||
|
units/dbus.target.in \
|
||||||
units/session/exit.service.in \
|
units/session/exit.service.in \
|
||||||
systemd.pc.in
|
systemd.pc.in
|
||||||
|
|
||||||
|
@ -738,8 +740,8 @@ if TARGET_FEDORA
|
||||||
rm -f display-manager.service && \
|
rm -f display-manager.service && \
|
||||||
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
|
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
|
||||||
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
|
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
|
||||||
rm -f display-manager.service && \
|
rm -f prefdm.service && \
|
||||||
$(LN_S) ../display-manager.service display-manager.service )
|
$(LN_S) ../prefdm.service prefdm.service )
|
||||||
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
|
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
|
||||||
rm -f rc-local.service && \
|
rm -f rc-local.service && \
|
||||||
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
|
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
|
||||||
|
@ -754,8 +756,8 @@ if TARGET_GENTOO
|
||||||
rm -f display-manager.service && \
|
rm -f display-manager.service && \
|
||||||
$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
|
$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
|
||||||
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
|
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
|
||||||
rm -f display-manager.service && \
|
rm -f prefdm.service && \
|
||||||
$(LN_S) ../display-manager.service display-manager.service )
|
$(LN_S) ../prefdm.service prefdm.service )
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = \
|
DISTCHECK_CONFIGURE_FLAGS = \
|
||||||
|
|
1
units/.gitignore
vendored
1
units/.gitignore
vendored
|
@ -6,3 +6,4 @@ graphical.target
|
||||||
multi-user.target
|
multi-user.target
|
||||||
getty@.service
|
getty@.service
|
||||||
remote-fs.target
|
remote-fs.target
|
||||||
|
dbus.target
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Halt
|
Description=Halt
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Power-Off
|
Description=Power-Off
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,10 +7,6 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=/etc/rc.local Compatibility
|
Description=/etc/rc.local Compatibility
|
||||||
Requires=basic.target
|
|
||||||
After=basic.target
|
|
||||||
Conflicts=shutdown.target
|
|
||||||
Before=getty@tty1.service
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/rc.local
|
ExecStart=/etc/rc.local
|
||||||
|
@ -18,3 +14,6 @@ ExectStop=/etc/rc.local.shutdown
|
||||||
TimeoutSec=0
|
TimeoutSec=0
|
||||||
StandardInput=tty
|
StandardInput=tty
|
||||||
ValidNoProcess=yes
|
ValidNoProcess=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Reboot
|
Description=Reboot
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=System Initialization
|
Description=System Initialization
|
||||||
|
DefaultDependencies=no
|
||||||
Before=local-fs.target remote-fs.target swap.target sockets.target
|
Before=local-fs.target remote-fs.target swap.target sockets.target
|
||||||
Conflicts=shutdown.target
|
Conflicts=shutdown.target
|
||||||
Before=shutdown.target
|
Before=shutdown.target
|
||||||
|
|
17
units/dbus.target.in
Normal file
17
units/dbus.target.in
Normal file
|
@ -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@
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Emergency Shell
|
Description=Emergency Shell
|
||||||
|
DefaultDependencies=no
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/bin/sh
|
ExecStart=/bin/sh
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Halt
|
Description=Halt
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target killall.service
|
Requires=shutdown.target killall.service
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kill All Processes
|
Description=Kill All Processes
|
||||||
|
DefaultDependencies=no
|
||||||
After=shutdown.target
|
After=shutdown.target
|
||||||
OnlyByDependency=yes
|
OnlyByDependency=yes
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Power-Off
|
Description=Power-Off
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target killall.service
|
Requires=shutdown.target killall.service
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,13 +7,11 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Display Manager
|
Description=Display Manager
|
||||||
Before=graphical.target
|
After=syslog.target dbus.target haldaemon.service
|
||||||
Requires=basic.target
|
|
||||||
After=basic.target syslog.target messagebus.service haldaemon.service
|
|
||||||
Conflicts=shutdown.target
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/X11/prefdm -nodaemon
|
ExecStart=/etc/X11/prefdm -nodaemon
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
Alias=display-manager.service
|
Alias=display-manager.service
|
||||||
|
WantedBy=graphical.target
|
||||||
|
|
|
@ -7,10 +7,6 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=/etc/rc.local Compatibility
|
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
|
# The rcN.d symlink uses the name "local" while the script itself is
|
||||||
# called "rc.local", hence carry both names here.
|
# called "rc.local", hence carry both names here.
|
||||||
|
@ -22,3 +18,6 @@ TimeoutSec=0
|
||||||
StandardInput=tty
|
StandardInput=tty
|
||||||
ValidNoProcess=yes
|
ValidNoProcess=yes
|
||||||
SysVStartPriority=99
|
SysVStartPriority=99
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Reboot
|
Description=Reboot
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target killall.service
|
Requires=shutdown.target killall.service
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=System Initialization
|
Description=System Initialization
|
||||||
|
DefaultDependencies=no
|
||||||
Before=local-fs.target remote-fs.target swap.target sockets.target
|
Before=local-fs.target remote-fs.target swap.target sockets.target
|
||||||
Conflicts=shutdown.target
|
Conflicts=shutdown.target
|
||||||
Before=shutdown.target
|
Before=shutdown.target
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Halt
|
Description=Halt
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target killall.service
|
Requires=shutdown.target killall.service
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Kill All Processes
|
Description=Kill All Processes
|
||||||
|
DefaultDependencies=no
|
||||||
After=shutdown.target
|
After=shutdown.target
|
||||||
OnlyByDependency=yes
|
OnlyByDependency=yes
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Power-Off
|
Description=Power-Off
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target killall.service
|
Requires=shutdown.target killall.service
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Reboot
|
Description=Reboot
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target killall.service
|
Requires=shutdown.target killall.service
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,10 +7,11 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Display Manager
|
Description=Display Manager
|
||||||
Before=graphical.target
|
After=syslog.target dbus.target hald.service
|
||||||
Requires=basic.target
|
|
||||||
After=basic.target syslog.target dbus.service hald.service
|
|
||||||
Conflicts=shutdown.target
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/init.d/xdm start
|
ExecStart=/etc/init.d/xdm start
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
Alias=display-manager.service
|
||||||
|
WantedBy=graphical.target
|
||||||
|
|
|
@ -14,8 +14,12 @@ m4_dnl
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Getty on %I
|
Description=Getty on %I
|
||||||
Before=getty.target
|
Before=getty.target
|
||||||
After=basic.target
|
m4_ifdef(`TARGET_FEDORA',
|
||||||
Conflicts=shutdown.target
|
After=rc-local.service
|
||||||
|
)m4_dnl
|
||||||
|
m4_ifdef(`TARGET_ARCH',
|
||||||
|
After=rc-local.service
|
||||||
|
)m4_dnl
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=TERM=linux
|
Environment=TERM=linux
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Exit
|
Description=Exit
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=shutdown.target
|
After=shutdown.target
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Halt
|
Description=Halt
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Power-Off
|
Description=Power-Off
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Reboot
|
Description=Reboot
|
||||||
|
DefaultDependencies=no
|
||||||
Requires=shutdown.target
|
Requires=shutdown.target
|
||||||
After=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
|
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
|
||||||
|
|
|
@ -9,5 +9,10 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Syslog
|
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@
|
Requires=@SPECIAL_SYSLOG_SERVICE@
|
||||||
After=@SPECIAL_SYSLOG_SERVICE@
|
After=@SPECIAL_SYSLOG_SERVICE@
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=systemd /dev/initctl Compatibility Daemon
|
Description=systemd /dev/initctl Compatibility Daemon
|
||||||
|
DefaultDependencies=no
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=@rootlibexecdir@/systemd-initctl
|
ExecStart=@rootlibexecdir@/systemd-initctl
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=systemd /dev/initctl Compatibility Socket
|
Description=systemd /dev/initctl Compatibility Socket
|
||||||
|
DefaultDependencies=no
|
||||||
After=sysinit.target
|
After=sysinit.target
|
||||||
Before=sockets.target
|
Before=sockets.target
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=systemd Logging Daemon
|
Description=systemd Logging Daemon
|
||||||
|
DefaultDependencies=no
|
||||||
After=@SPECIAL_SYSLOG_SERVICE@
|
After=@SPECIAL_SYSLOG_SERVICE@
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=systemd Logging Socket
|
Description=systemd Logging Socket
|
||||||
|
DefaultDependencies=no
|
||||||
After=sysinit.target
|
After=sysinit.target
|
||||||
Before=sockets.target
|
Before=sockets.target
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue