summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4b7ce26)
Signed-off-by: Niclas Berglind <nb@kjam.se>
$ds_exists = false;
}
if ($ds_exists) {
$ds_exists = false;
}
if ($ds_exists) {
- $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+ $cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
$this->exec($cmd, $out2, $res2);
foreach ($out2 as $line2) {
$this->exec($cmd, $out2, $res2);
foreach ($out2 as $line2) {
- if (preg_match('/^' . preg_quote($name, '/') . '\@.*$/', $line2)) {
$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
}
} else {
$this->create();
}
} else {
$this->create();
$zvol_exists = false;
}
if ($zvol_exists) {
$zvol_exists = false;
}
if ($zvol_exists) {
- $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+ $cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
$this->exec($cmd, $out2, $res2);
foreach ($out2 as $line2) {
$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
$this->exec($cmd, $out2, $res2);
foreach ($out2 as $line2) {
$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);