summaryrefslogtreecommitdiff
path: root/units/fedora
diff options
context:
space:
mode:
Diffstat (limited to 'units/fedora')
-rw-r--r--units/fedora/halt.service1
-rw-r--r--units/fedora/killall.service1
-rw-r--r--units/fedora/poweroff.service1
-rw-r--r--units/fedora/prefdm.service6
-rw-r--r--units/fedora/rc-local.service7
-rw-r--r--units/fedora/reboot.service1
-rw-r--r--units/fedora/sysinit.service1
7 files changed, 10 insertions, 8 deletions
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 50373d48b6..815c8fbdad 100644
--- 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 84c56cb8d3..8ccbbcea8e 100644
--- 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 f237e32719..2149dbf6db 100644
--- 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 2f4333f3c0..89a96be1c8 100644
--- 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 58b59820e2..c2d2e00fd7 100644
--- 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 b99dfdc8ac..31aa74e141 100644
--- 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 5981552da9..884de8d1d6 100644
--- 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