From a50e3caf1d538eb4bb0cd5eb8f634cb18e0065ab Mon Sep 17 00:00:00 2001 From: Niclas Berglind Date: Sun, 23 Mar 2014 15:23:49 +0100 Subject: [PATCH] Minor change to snapshots in Dataset and Zvol classes. Signed-off-by: Niclas Berglind --- src/Dataset.php | 11 ++++------- src/Zvol.php | 12 +++++------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/Dataset.php b/src/Dataset.php index 9ee6579..28bd4d1 100644 --- a/src/Dataset.php +++ b/src/Dataset.php @@ -67,13 +67,10 @@ class OMVModuleZFSDataset { continue; } } - $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]); - } + $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); } } diff --git a/src/Zvol.php b/src/Zvol.php index f2d3cd2..603188a 100644 --- a/src/Zvol.php +++ b/src/Zvol.php @@ -68,14 +68,12 @@ class OMVModuleZFSZvol { continue; } } - $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]); - } + $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); } + } /** -- 2.39.2