5 files changed, 25 insertions, 3 deletions
diff --git a/systemd/system/fedora-import-state.service b/systemd/system/fedora-import-state.service
new file mode 100644
index 00000000..00d3d066
--- /dev/null
+++ b/systemd/system/fedora-import-state.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Import network configuration from initramfs
+DefaultDependencies=no
+ConditionPathIsReadWrite=/
+ConditionDirectoryNotEmpty=/run/initramfs/state
+Conflicts=shutdown.target
+Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service
+After=remount-rootfs.service
+
+[Service]
+ExecStart=/lib/systemd/fedora-import-state
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
diff --git a/systemd/system/fedora-readonly.service b/systemd/system/fedora-readonly.service
index eca197f0..2a7db25f 100644
--- a/systemd/system/fedora-readonly.service
+++ b/systemd/system/fedora-readonly.service
@@ -2,12 +2,11 @@
 Description=Configure read-only root support
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service
+Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service local-fs.target
 After=remount-rootfs.service
 
 [Service]
 ExecStart=/lib/systemd/fedora-readonly
 Type=oneshot
 TimeoutSec=0
-StandardInput=tty
 RemainAfterExit=yes
diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service
index bfd4b73b..69ad0891 100644
--- a/systemd/system/fedora-storage-init-late.service
+++ b/systemd/system/fedora-storage-init-late.service
@@ -5,6 +5,9 @@ Conflicts=shutdown.target
 After=cryptsetup.target fedora-storage-init.service
 Before=local-fs.target shutdown.target
 Wants=fedora-wait-storage.service
+ConditionFileIsExecutable=|/sbin/lvm
+ConditionFileIsExecutable=|/sbin/dmraid
+ConditionPathExists=|/etc/multipath.conf
 
 [Service]
 ExecStart=/lib/systemd/fedora-storage-init
diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service
index add337b6..6d8e39ff 100644
--- a/systemd/system/fedora-storage-init.service
+++ b/systemd/system/fedora-storage-init.service
@@ -5,6 +5,9 @@ Conflicts=shutdown.target
 After=fedora-wait-storage.service
 Before=local-fs.target shutdown.target
 Wants=fedora-wait-storage.service
+ConditionFileIsExecutable=|/sbin/lvm
+ConditionFileIsExecutable=|/sbin/dmraid
+ConditionPathExists=|/etc/multipath.conf
 
 [Service]
 ExecStart=/lib/systemd/fedora-storage-init
diff --git a/systemd/system/fedora-wait-storage.service b/systemd/system/fedora-wait-storage.service
index 230dadec..9d3b6ae9 100644
--- a/systemd/system/fedora-wait-storage.service
+++ b/systemd/system/fedora-wait-storage.service
@@ -4,7 +4,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-udev-settle.service
 Before=local-fs.target shutdown.target
-Wants=systemd-udevd.service systemd-udev-settle.service
+Wants=systemd-udev-settle.service
 
 [Service]
 ExecStart=-/sbin/rmmod scsi_wait_scan
@@ -13,3 +13,6 @@ ExecStart=-/sbin/rmmod scsi_wait_scan
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
+StandardInput=null
+StandardOutput=null
+StandardError=null