From e7733965b4047e9410c19ad938d6bb2bf7fe3b9b Mon Sep 17 00:00:00 2001
From: Nick Holloway <nick.holloway@pyrites.org.uk>
Date: Sun, 14 Feb 2016 14:04:35 +0000
Subject: [PATCH] Fix #5890 find disk slices as candidates for loading
 "config.xml" at boot

In commit 873c1701, the call to "/bin/ls /dev/{$disk}s*" was surrounded
with "escapeshellarg" so the wildcard is not expanded.

Use "glob" to find the slices for a disk instead.
---
 etc/ecl.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/etc/ecl.php b/etc/ecl.php
index 9aa07d58be..53e7637ac8 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() {