7 files changed, 33 insertions, 37 deletions
diff --git a/systemd/system/fedora-autorelabel-mark.service b/systemd/system/fedora-autorelabel-mark.service
new file mode 100644
index 00000000..33b5147b
--- /dev/null
+++ b/systemd/system/fedora-autorelabel-mark.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Mark the need to relabel after reboot
+DefaultDependencies=no
+Requires=local-fs.target
+Conflicts=shutdown.target
+After=local-fs.target
+Before=sysinit.target shutdown.target
+ConditionSecurity=!selinux
+ConditionPathIsDirectory=/etc/selinux
+ConditionPathExists=!/.autorelabel
+
+[Service]
+ExecStart=-/bin/touch /.autorelabel
+Type=oneshot
+RemainAfterExit=yes
diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service
index 10b37f69..c98a40ff 100644
--- a/systemd/system/fedora-autorelabel.service
+++ b/systemd/system/fedora-autorelabel.service
@@ -5,8 +5,9 @@ Requires=local-fs.target
 Conflicts=shutdown.target
 After=local-fs.target
 Before=sysinit.target shutdown.target
-ConditionKernelCommandLine=autorelabel
-ConditionPathExists=/.autorelabel
+ConditionSecurity=selinux
+ConditionKernelCommandLine=|autorelabel
+ConditionPathExists=|/.autorelabel
 
 [Service]
 ExecStart=/lib/systemd/fedora-autorelabel
diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service
deleted file mode 100644
index 21754c9c..00000000
--- a/systemd/system/fedora-autoswap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Enable all detected swap partitions
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=swap.target shutdown.target
-
-[Service]
-ExecStart=/lib/systemd/fedora-autoswap
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
diff --git a/systemd/system/fedora-loadmodules.service b/systemd/system/fedora-loadmodules.service
index 9b801258..cd2b4910 100644
--- a/systemd/system/fedora-loadmodules.service
+++ b/systemd/system/fedora-loadmodules.service
@@ -4,8 +4,8 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=sysinit.target shutdown.target
-ConditionPathExists=/etc/rc.modules
-ConditionDirectoryNotEmpty=/etc/sysconfig/modules/
+ConditionPathExists=|/etc/rc.modules
+ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/
 
 [Service]
 ExecStart=/lib/systemd/fedora-loadmodules
diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service
new file mode 100644
index 00000000..bfd4b73b
--- /dev/null
+++ b/systemd/system/fedora-storage-init-late.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Initialize storage subsystems (RAID, LVM, etc.)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=cryptsetup.target fedora-storage-init.service
+Before=local-fs.target shutdown.target
+Wants=fedora-wait-storage.service
+
+[Service]
+ExecStart=/lib/systemd/fedora-storage-init
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
diff --git a/systemd/system/fedora-sysinit-hack.service b/systemd/system/fedora-sysinit-hack.service
deleted file mode 100644
index dd78da80..00000000
--- a/systemd/system/fedora-sysinit-hack.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Bootup hack
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=basic.target shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/touch /dev/.in_sysinit
diff --git a/systemd/system/fedora-sysinit-unhack.service b/systemd/system/fedora-sysinit-unhack.service
deleted file mode 100644
index 221d8bb1..00000000
--- a/systemd/system/fedora-sysinit-unhack.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Bootup unhack
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target
-After=fedora-sysinit-hack.service sysinit.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=-/bin/rm -f /dev/.in_sysinit