diff options
| author | Bill Nottingham <notting@redhat.com> | 2012-11-06 14:23:17 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2012-11-06 14:23:17 -0500 |
| commit | fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c (patch) | |
| tree | df35c71d7b2dd9c168d156dda88817dff70b84f8 | |
| parent | 8b18565ab2aafd5ffcf504a357ae98cb5a612fdd (diff) | |
| download | initscripts-fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c.tar initscripts-fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c.tar.gz initscripts-fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c.tar.bz2 initscripts-fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c.tar.xz initscripts-fb580ace2e92ca5b51b8d5e24c28c3ce2e00ee9c.zip | |
Drop fedora-wait-storage since scsi_wait_scan no longer exists ... move udev-settle requirements to fedora-storage-init. (#870544)
| -rw-r--r-- | systemd/system/fedora-storage-init-late.service | 1 | ||||
| -rw-r--r-- | systemd/system/fedora-storage-init.service | 4 | ||||
| -rw-r--r-- | systemd/system/fedora-wait-storage.service | 18 |
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 |