From 0e8d247010bb776a5b55639f38575b4f95e019b3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 19 Jun 2012 12:17:40 -0400
Subject: Only run fedora-storage-init if we have the tools that it invokes.

---
 systemd/system/fedora-storage-init-late.service | 3 +++
 systemd/system/fedora-storage-init.service      | 3 +++
 2 files changed, 6 insertions(+)

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
-- 
cgit v1.2.1