Skip to content

Commit

Permalink
Fix Zvolume to appear in filesystem
Browse files Browse the repository at this point in the history
  • Loading branch information
luxflow committed Aug 26, 2016
1 parent 18fab67 commit 6555c64
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ openmediavault-zfs (3.0.2) stable; urgency=low

* Porting to OMV 3.0.26
* Fix filesystem to show all dataset
* Fix Zvolume to appear in filesystem

-- OpenMediaVault Plugin Developers <[email protected]> Fri, 26 Aug 2016 10:49:05 +0900

Expand Down
15 changes: 7 additions & 8 deletions usr/share/omvzfs/OMVStorageZvol.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<?php

use OMV\System;
use OMV\System\Filesystem\Backend\Manager;
require_once("/usr/share/omvzfs/Utils.php");
require_once("/usr/share/omvzfs/Dataset.php");
require_once("/usr/share/omvzfs/Exception.php");
Expand All @@ -12,7 +9,7 @@
* Implements the storage device backend for ZFS Zvol devices.
* @ingroup api
*/
class OMVStorageDeviceBackendZvol extends System\Storage\Backend\BackendAbstract {
class OMVStorageDeviceBackendZvol extends \OMV\System\Storage\Backend\BackendAbstract {
function getType() {
return OMV_STORAGE_DEVICE_TYPE_ZVOL;
}
Expand Down Expand Up @@ -47,7 +44,7 @@ function fsDeviceFile($deviceFile) {
* This class provides a simple interface to handle ZFS Zvol devices.
* @ingroup api
*/
class OMVStorageDeviceZvol extends System\Storage\StorageDevice {
class OMVStorageDeviceZvol extends \OMV\System\Storage\StorageDevice {
/**
* Get the description of the device.
* @return The device description, FALSE on failure.
Expand All @@ -61,7 +58,7 @@ public function getDescription() {
}
}

class OMVFilesystemZFS extends System\Filesystem\Filesystem {
class OMVFilesystemZFS extends \OMV\System\Filesystem\Filesystem {

public function __construct($fsName) {
$this->deviceFile = $fsName;
Expand Down Expand Up @@ -427,7 +424,7 @@ public static function hasFileSystem($deviceFile) {
}
}

class OMVFilesystemBackendZFS extends System\Filesystem\Backend\BackendAbstract {
class OMVFilesystemBackendZFS extends \OMV\System\Filesystem\Backend\BackendAbstract {
public function __construct() {
$this->type = "zfs";
$this->properties = self::PROP_POSIX_ACL;
Expand Down Expand Up @@ -467,6 +464,8 @@ public function isBlkidEnumerated() {

}

$mngr = Manager::getInstance();
$mngr = \OMV\System\Storage\Backend\Manager::getInstance();
$mngr->registerBackend(new OMVStorageDeviceBackendZvol());
$mngr = \OMV\System\Filesystem\Backend\Manager::getInstance();
$mngr->registerBackend(new OMVFilesystemBackendZFS());
?>

0 comments on commit 6555c64

Please sign in to comment.