3 files changed, 17 insertions, 5 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 90019b649c4..babf1c7d4ea 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -343,7 +343,7 @@ class Filesystem {
 		self::$defaultInstance = new View($root);
 
 		if (!self::$mounts) {
-			self::$mounts = new Mount\Manager();
+			self::$mounts = \OC::$server->getMountManager();
 		}
 
 		//load custom mount config
@@ -356,7 +356,7 @@ class Filesystem {
 
 	static public function initMountManager() {
 		if (!self::$mounts) {
-			self::$mounts = new Mount\Manager();
+			self::$mounts = \OC::$server->getMountManager();
 		}
 	}
 
diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php
index 0a606daaf1f..d5bd4d7ddf4 100644
--- a/lib/private/files/mount/manager.php
+++ b/lib/private/files/mount/manager.php
@@ -25,17 +25,19 @@
 namespace OC\Files\Mount;
 
 use \OC\Files\Filesystem;
+use OCP\Files\Mount\IMountManager;
+use OCP\Files\Mount\IMountPoint;
 
-class Manager {
+class Manager implements IMountManager {
 	/**
 	 * @var MountPoint[]
 	 */
 	private $mounts = array();
 
 	/**
-	 * @param MountPoint $mount
+	 * @param IMountPoint $mount
 	 */
-	public function addMount(MountPoint $mount) {
+	public function addMount(IMountPoint $mount) {
 		$this->mounts[$mount->getMountPoint()] = $mount;
 	}
 
diff --git a/lib/private/server.php b/lib/private/server.php
index c08940bb756..af137ce36aa 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -441,6 +441,9 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 			return new NoopLockingProvider();
 		});
+		$this->registerService('MountManager', function () {
+			return new \OC\Files\Mount\Manager();
+		});
 	}
 
 	/**
@@ -941,4 +944,11 @@ class Server extends SimpleContainer implements IServerContainer {
 	public function getLockingProvider() {
 		return $this->query('LockingProvider');
 	}
+
+	/**
+	 * @return \OCP\Files\Mount\IMountManager
+	 **/
+	function getMountManager() {
+		return $this->query('MountManager');
+	}
 }