Fix regression. NTFS file systems were not listed as shared folder ca…

…ndidates.
openmediavault · Sep 22, 2016 · 003d369 · 003d369
1 parent fcd1626
commit 003d369
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/deb/openmediavault/debian/changelog b/deb/openmediavault/debian/changelog
@@ -1,5 +1,8 @@
 openmediavault (3.0.38) stable; urgency=low
 
+  * Various improvements and bugfixes.
+  * Fix regression. NTFS file systems were not listed as shared folder
+    candidates.
   * Mantis 0001604: Update package dependency.
 
  -- Volker Theile <volker.theile@openmediavault.org>  Wed, 21 Sep 2016 16:15:23 +0200

diff --git a/deb/openmediavault/usr/share/openmediavault/engined/inc/60filesystembackend.inc b/deb/openmediavault/usr/share/openmediavault/engined/inc/60filesystembackend.inc
@@ -26,7 +26,7 @@ namespace OMV\System\Filesystem\Backend;
 ///////////////////////////////////////////////////////////////////////////////
 $backends = [ "Btrfs", "Ext", "Ext2", "Ext3", "Ext4", "Hfsplus",
   "Iso9660", "Jfs", "Msdos", "None", "Ntfs", "Reiserfs", "Udf", "Ufs",
-  "Umsdos", "Exfat", "Vfat", "Xfs" ];
+  "Umsdos", "Exfat", "Vfat", "Xfs", "Fuseblk" ];
 $mngr = Manager::getInstance();
 foreach ($backends as $backendk => $backendv) {
 	$className = sprintf("%s\%s", __NAMESPACE__, $backendv);

diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/filesystem/backend/fuseblk.inc b/deb/openmediavault/usr/share/php/openmediavault/system/filesystem/backend/fuseblk.inc
@@ -0,0 +1,37 @@
+<?php
+/**
+ * This file is part of OpenMediaVault.
+ *
+ * @license   http://www.gnu.org/licenses/gpl.html GPL Version 3
+ * @author    Volker Theile <volker.theile@openmediavault.org>
+ * @copyright Copyright (c) 2009-2016 Volker Theile
+ *
+ * OpenMediaVault is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * OpenMediaVault is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenMediaVault. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace OMV\System\Filesystem\Backend;
+
+/**
+ * This backend is required to support filesystems that are mounted
+ * via FUSE.
+ *
+ * Such filesystems are listed as type 'fuseblk' in /proc/mounts:
+ * /dev/sdj1 on /media/43C00A552F032479 type fuseblk (rw,relatime,user_id=0,group_id=0,allow_other,blksize=4096)
+ * The blkid command has the following output:
+ * /dev/sdj1: UUID="43C00A552F032479" TYPE="ntfs" PARTUUID="6eaa90f6-01"
+ */
+class Fuseblk extends BackendAbstract {
+	public function __construct() {
+		$this->type = "fuseblk";
+	}
+}