3 files changed, 2 insertions, 21 deletions
diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service
index 69ad0891..edd6d0ca 100644
--- a/systemd/system/fedora-storage-init-late.service
+++ b/systemd/system/fedora-storage-init-late.service
@@ -4,7 +4,6 @@ DefaultDependencies=no
 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
diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service
index 6d8e39ff..bb559d77 100644
--- a/systemd/system/fedora-storage-init.service
+++ b/systemd/system/fedora-storage-init.service
@@ -2,9 +2,9 @@
 Description=Initialize storage subsystems (RAID, LVM, etc.)
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=fedora-wait-storage.service
+After=systemd-udev-settle.service
 Before=local-fs.target shutdown.target
-Wants=fedora-wait-storage.service
+Wants=systemd-udev-settle.service
 ConditionFileIsExecutable=|/sbin/lvm
 ConditionFileIsExecutable=|/sbin/dmraid
 ConditionPathExists=|/etc/multipath.conf
diff --git a/systemd/system/fedora-wait-storage.service b/systemd/system/fedora-wait-storage.service
deleted file mode 100644
index 9d3b6ae9..00000000
--- a/systemd/system/fedora-wait-storage.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Wait for storage scan
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-udev-settle.service
-Before=local-fs.target shutdown.target
-Wants=systemd-udev-settle.service
-
-[Service]
-ExecStart=-/sbin/rmmod scsi_wait_scan
-ExecStart=-/sbin/modprobe scsi_wait_scan
-ExecStart=-/sbin/rmmod scsi_wait_scan
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=null
-StandardOutput=null
-StandardError=null