Merge pull request #2634 from nwholloway/eclfix_2_2

pfsense · Feb 14, 2016 · c3b9b53 · c3b9b53
2 parents efebd86 + e773396
commit c3b9b53
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/etc/ecl.php b/etc/ecl.php
@@ -50,13 +50,9 @@ function get_swap_disks() {
 
 function get_disk_slices($disk) {
 	global $g, $debug;
-	$slices_array = array();
-	$slices = trim(exec("/bin/ls " . escapeshellarg("/dev/" . $disk . "s*") . " 2>/dev/null"));
+	$slices = glob("/dev/" . $disk . "s*");
 	$slices = str_replace("/dev/", "", $slices);
-	if($slices == "ls: No match.") 
-		return;
-	$slices_array = explode(" ", $slices);
-	return $slices_array;
+	return $slices;
 }
 
 function get_disks() {