[pve-devel] [PATCH V2 storage 06/10] Register CIFSPlugin in the storage plugin system.

Wolfgang Link w.link at proxmox.com
Fri Mar 16 10:22:55 CET 2018


---
 PVE/Storage.pm        |  2 ++
 PVE/Storage/Plugin.pm | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 143ed2e..6a2b40b 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -25,6 +25,7 @@ use PVE::Storage::DirPlugin;
 use PVE::Storage::LVMPlugin;
 use PVE::Storage::LvmThinPlugin;
 use PVE::Storage::NFSPlugin;
+use PVE::Storage::CIFSPlugin;
 use PVE::Storage::ISCSIPlugin;
 use PVE::Storage::RBDPlugin;
 use PVE::Storage::SheepdogPlugin;
@@ -42,6 +43,7 @@ PVE::Storage::DirPlugin->register();
 PVE::Storage::LVMPlugin->register();
 PVE::Storage::LvmThinPlugin->register();
 PVE::Storage::NFSPlugin->register();
+PVE::Storage::CIFSPlugin->register();
 PVE::Storage::ISCSIPlugin->register();
 PVE::Storage::RBDPlugin->register();
 PVE::Storage::SheepdogPlugin->register();
diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 6f72cee..163871d 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -19,6 +19,17 @@ our @COMMON_TAR_FLAGS = qw(
     --warning=no-file-ignored --warning=no-xattr-write
 );
 
+our @SHARED_STORAGE = (
+    'iscsi',
+    'nfs',
+    'cifs',
+    'rbd',
+    'sheepdog',
+    'iscsidirect',
+    'glusterfs',
+    'zfs',
+    'drbd');
+
 cfs_register_file ('storage.cfg',
 		   sub { __PACKAGE__->parse_config(@_); },
 		   sub { __PACKAGE__->write_config(@_); });
@@ -331,8 +342,7 @@ sub parse_config {
 	if ($def->{content}) {
 	    $d->{content} = $def->{content}->[1] if !$d->{content};
 	}
-
-	if ($type eq 'iscsi' || $type eq 'nfs' || $type eq 'rbd' || $type eq 'sheepdog' || $type eq 'iscsidirect' || $type eq 'glusterfs' || $type eq 'zfs' || $type eq 'drbd') {
+	if (grep { $_ eq $type }  @SHARED_STORAGE) {
 	    $d->{shared} = 1;
 	}
     }
-- 
2.11.0





More information about the pve-devel mailing list