From 6091b58b60f532d8e3f317b99f7ea85d99853db3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 31 Oct 2012 13:31:48 -0400 Subject: Drop fedora-storage-init; conflict with older lvm & dmraid so we get the required versions that allow us to do so. () --- systemd/system/fedora-storage-init-late.service | 16 ---------------- systemd/system/fedora-storage-init.service | 16 ---------------- systemd/system/fedora-wait-storage.service | 18 ------------------ 3 files changed, 50 deletions(-) delete mode 100644 systemd/system/fedora-storage-init-late.service delete mode 100644 systemd/system/fedora-storage-init.service delete mode 100644 systemd/system/fedora-wait-storage.service (limited to 'systemd/system') diff --git a/systemd/system/fedora-storage-init-late.service b/systemd/system/fedora-storage-init-late.service deleted file mode 100644 index 69ad0891..00000000 --- a/systemd/system/fedora-storage-init-late.service +++ /dev/null @@ -1,16 +0,0 @@ -[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 -ConditionFileIsExecutable=|/sbin/lvm -ConditionFileIsExecutable=|/sbin/dmraid -ConditionPathExists=|/etc/multipath.conf - -[Service] -ExecStart=/lib/systemd/fedora-storage-init -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service deleted file mode 100644 index 6d8e39ff..00000000 --- a/systemd/system/fedora-storage-init.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Initialize storage subsystems (RAID, LVM, etc.) -DefaultDependencies=no -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 -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes 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 -- cgit v1.2.1