X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/8b1436f982dd8196bf292d6e045f041af1691cfb..e419cf47cc59a0f8ea6b62a66138ea4336046dcb:/src/Dataset.php diff --git a/src/Dataset.php b/src/Dataset.php index 9ee6579..9abdb82 100644 --- a/src/Dataset.php +++ b/src/Dataset.php @@ -56,23 +56,22 @@ class OMVModuleZFSDataset { * @access public */ public function __construct($name) { + $ds_exists = true; $this->name = $name; - $qname = preg_quote($name, '/'); - $cmd = "zfs list -H 2>&1"; - $this->exec($cmd, $out, $res); - foreach ($out as $line) { - if (preg_match('/^' . $qname . '\t.*$/', $line)) { - $this->updateAllProperties(); - $this->mountPoint = $this->properties["mountpoint"]["value"]; - continue; - } + $cmd = "zfs list -H -t filesystem " . $name . " 2>&1"; + try { + $this->exec($cmd, $out, $res); + $this->updateAllProperties(); + $this->mountPoint = $this->properties["mountpoint"]["value"]; } - $qname = preg_quote($name . "@", '/'); - $cmd = "zfs list -H -t snapshot 2>&1"; - $this->exec($cmd, $out, $res); - foreach ($out as $line) { - if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) { - $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]); + catch (OMVModuleZFSException $e) { + $ds_exists = false; + } + if ($ds_exists) { + $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1"; + $this->exec($cmd, $out2, $res2); + foreach ($out2 as $line2) { + $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2); } } }