]> git.datanom.net - omvzfs.git/commitdiff
Fix to support /dev/disk/by-path when assembling an existing pool.
authorNiclas Berglind <nb@kjam.se>
Tue, 23 Sep 2014 18:52:37 +0000 (20:52 +0200)
committerMichael Rasmussen <mir@datanom.net>
Tue, 23 Sep 2014 21:12:04 +0000 (23:12 +0200)
Signed-off-by: Niclas Berglind <nb@kjam.se>
src/Zpool.php

index 0ef151512ce2e6e73708cc9a232fc9f058889758..6c06e3d97a3429f33b6d468ed06b114b895f94dd 100644 (file)
@@ -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
This page took 0.031162 seconds and 5 git commands to generate.