Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
f585994c
Commit
f585994c
authored
Apr 02, 2015
by
Robin Appelman
Browse files
setup mount manager before wrappers
parent
3cb53b77
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/private/files/filesystem.php
View file @
f585994c
...
...
@@ -349,7 +349,7 @@ class Filesystem {
return
true
;
}
static
public
function
initMount
s
()
{
static
public
function
initMount
Manager
()
{
if
(
!
self
::
$mounts
)
{
self
::
$mounts
=
new
Mount\Manager
();
}
...
...
lib/private/util.php
View file @
f585994c
...
...
@@ -67,7 +67,7 @@ class OC_Util {
// mount local file backend as root
$configDataDirectory
=
OC_Config
::
getValue
(
"datadirectory"
,
OC
::
$SERVERROOT
.
"/data"
);
//first set up the local "root" storage
\
OC\Files\Filesystem
::
initMount
s
();
\
OC\Files\Filesystem
::
initMount
Manager
();
if
(
!
self
::
$rootMounted
)
{
\
OC\Files\Filesystem
::
mount
(
'\OC\Files\Storage\Local'
,
array
(
'datadir'
=>
$configDataDirectory
),
'/'
);
self
::
$rootMounted
=
true
;
...
...
@@ -96,7 +96,7 @@ class OC_Util {
$config
[
'class'
]
=
'\OC\Files\ObjectStore\ObjectStoreStorage'
;
// mount object storage as root
\
OC\Files\Filesystem
::
initMount
s
();
\
OC\Files\Filesystem
::
initMount
Manager
();
if
(
!
self
::
$rootMounted
)
{
\
OC\Files\Filesystem
::
mount
(
$config
[
'class'
],
$config
[
'arguments'
],
'/'
);
self
::
$rootMounted
=
true
;
...
...
@@ -133,6 +133,8 @@ class OC_Util {
self
::
$fsSetup
=
true
;
}
\
OC\Files\Filesystem
::
initMountManager
();
\
OC\Files\Filesystem
::
addStorageWrapper
(
'mount_options'
,
function
(
$mountPoint
,
\
OCP\Files\Storage
$storage
,
\
OCP\Files\Mount\IMountPoint
$mount
)
{
if
(
$storage
->
instanceOfStorage
(
'\OC\Files\Storage\Common'
))
{
/** @var \OC\Files\Storage\Common $storage */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment