From e6831d92b1f11c6b452ae49ce81c33b47af76f8b Mon Sep 17 00:00:00 2001 From: Niclas Berglind Date: Wed, 5 Mar 2014 21:34:21 +0100 Subject: [PATCH] Made it optional to create Dataset on commandline in constructor. Changed properties attribute. Signed-off-by: Niclas Berglind --- src/Dataset.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Dataset.php b/src/Dataset.php index 57e8edd..55358ea 100644 --- a/src/Dataset.php +++ b/src/Dataset.php @@ -43,15 +43,18 @@ class OMVModuleZFSDataset { * * @param string $name Name of the new Dataset * @param array $properties An associative array with properties to set when creating the Dataset + * @param bool $create Should the Dataset be created on commandline? Defaults to false. * */ - public function __construct($name, array $properties = null) { - $cmd = "zfs create -p " . $name . " 2>&1"; - $this->exec($cmd,$out,$res); + public function __construct($name, array $properties = null, $create = false) { + if ($create) { + $cmd = "zfs create -p " . $name . " 2>&1"; + $this->exec($cmd,$out,$res); + } $this->name = $name; $this->updateAllProperties(); $this->setProperties($properties); - $this->mountPoint = $this->properties["mountpoint"][0]; + $this->mountPoint = $this->properties["mountpoint"]["value"]; } /** @@ -124,7 +127,7 @@ class OMVModuleZFSDataset { unset($this->properties); foreach ($out as $line) { $tmpary = preg_split('/\t+/', $line); - $this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]); + $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]); } } @@ -139,7 +142,7 @@ class OMVModuleZFSDataset { $cmd = "zfs get -H " . $property . " " . $this->name; $this->exec($cmd,$out,$res); $tmpary = preg_split('/\t+/', $out[0]); - $this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]); + $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]); } /** -- 2.39.2