summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-02-14 12:58:03 -0600
committerLuiz Otavio O Souza <luiz@netgate.com>2016-02-14 12:58:03 -0600
commitc3b9b531875f7e94d99e2e7d5648e0decb21d720 (patch)
tree4e733b9d368a44e20855c48377e57492ffc0ecd1
parentefebd867ec266120cc682e20bae15b38cae6c04a (diff)
parente7733965b4047e9410c19ad938d6bb2bf7fe3b9b (diff)
downloadpfsense-c3b9b531875f7e94d99e2e7d5648e0decb21d720.zip
pfsense-c3b9b531875f7e94d99e2e7d5648e0decb21d720.tar.gz
Merge pull request #2634 from nwholloway/eclfix_2_2
-rwxr-xr-xetc/ecl.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/etc/ecl.php b/etc/ecl.php
index 9aa07d5..53e7637 100755
--- 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() {
OpenPOWER on IntegriCloud