do not try to determine raid and lvm info if tools are missing

faiproject · Jul 18, 2016 · 83977b4 · 83977b4
1 parent 41c79a7
commit 83977b4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bin/setup-storage b/bin/setup-storage
@@ -164,10 +164,10 @@ defined($FAI::udev_settle) or die "Failed to find determine a proper way to tell
 &FAI::get_current_disks;
 
 # see whether there are any existing LVMs
-&FAI::get_current_lvm;
+&FAI::in_path("pvdisplay") and &FAI::get_current_lvm;
 
 # see whether there are any existing RAID devices
-&FAI::get_current_raid;
+&FAI::in_path("mdadm") and &FAI::get_current_raid;
 
 # mark devices as preserve, where not all already done so and check that only
 # defined devices are marked preserve