units: update other distro units to recent fedora changes

diff --git a/units/arch/halt.service b/units/arch/halt.service
index 87224e34b6142ab4a0c8627afadbac7a9e4aa215..2017d91bf59fbeaef56c85d5c5c872d8cd55021a 100644 (file)
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service
index ffa592c8f67c7196a5f472fe09d13a9069b97b29..04922db3153a0ed5e15d4f4493d036bd9e84427a 100644 (file)
--- a/units/arch/poweroff.service
+++ b/units/arch/poweroff.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/arch/reboot.service b/units/arch/reboot.service
index 934903dc6b5b3c4df44efe28f30e6c5311fc2766..8d1e90f5aa40d3a10bd6d1c11794e65fdc8727a7 100644 (file)
--- a/units/arch/reboot.service
+++ b/units/arch/reboot.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/arch/sysinit.service b/units/arch/sysinit.service
index 1a19baf2f667dc5d1d960aaeb2cfba7eaa15524f..880deccf9c8e7a04987be908310f4548a9042151 100644 (file)
--- a/units/arch/sysinit.service
+++ b/units/arch/sysinit.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=System Initialization
 DefaultDependencies=no
 [Unit]
 Description=System Initialization
 DefaultDependencies=no

-Before=local-fs.target remote-fs.target swap.target sockets.target

 Conflicts=shutdown.target
 Conflicts=shutdown.target

-Before=shutdown.target
+Before=shutdown.target emergency.service emergency.target

 
 [Service]
 ExecStart=/etc/rc.sysinit
 
 [Service]
 ExecStart=/etc/rc.sysinit

diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 89a96be1c8885b4080b6f2235a3b8f557ebb4982..79a2af39dc46b3ca236fe57677c77edf1d553aee 100644 (file)
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Display Manager
 
 [Unit]
 Description=Display Manager

-After=syslog.target dbus.target haldaemon.service
+After=syslog.target haldaemon.service

 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon
 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon

diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index 19ead8a315a3dac732b3639a3edbcbe84111b7af..0b4de1148fec5dfd464cd6294bff9cb8afb2499d 100644 (file)
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 9ceb205b05195c08a227b7199f920887f050c5de..f4b8fbf12233b4fdd462d4f3ea41813c9b952d9d 100644 (file)
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index c223e6c26f4390171cffdfce0c6539599d6ba2f8..7492aaedb239c3a0f4ecba5c455aff92c7a6cbd2 100644 (file)
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/suse/halt.service b/units/suse/halt.service
index 5f42ac691f72557c78ccbf22b9648a7b84188c65..75e30632c01339cfbed6f894d8acb4cc004de42c 100644 (file)
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index 93a9da502ad839bd2d3c8b563e9ebcbd4c18aa36..f9f7b56dc1fd18eb249e2100b86d65901381d7ef 100644 (file)
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish

diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index c3526b3035c3070f730e9ca531f6c76b94ae6737..5fc24d1c8f5fc479243733eb79eb3886570d33f2 100644 (file)
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
 [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
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target

 
 [Service]
 Type=finish
 
 [Service]
 Type=finish