mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5890 find disk slices as candidates for loading "config.xml" at boot

Browse Source 
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.
This commit is contained in:
Nick Holloway 2016-02-14 14:04:35 +00:00
parent efebd867ec
commit e7733965b4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/ecl.php
View File

@ -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() {