From: Niclas Berglind <nb@kjam.se>
Date: Tue, 23 Sep 2014 18:52:37 +0000 (+0200)
Subject: Fix to support /dev/disk/by-path when assembling an existing pool.
X-Git-Url: http://git.datanom.net/omvzfs.git/commitdiff_plain/aec28e5f3581a9cf26453a678187f007894491bb

Fix to support /dev/disk/by-path when assembling an existing pool.

Signed-off-by: Niclas Berglind <nb@kjam.se>
---

diff --git a/src/Zpool.php b/src/Zpool.php
index 0ef1515..6c06e3d 100644
--- a/src/Zpool.php
+++ b/src/Zpool.php
@@ -753,7 +753,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract {
 									$dev = null;
 								}
 								$type = $match[1];
-							} else if (preg_match("/^\s*([\w\d-]+)\s+/", $line, $match)) {
+							} else if (preg_match("/^\s*([\w\d-a-z0-9\:\.\-]+)\s+/", $line, $match)) {
 								if ($dev)
 									$dev .= " $match[1]";
 								else