[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
Jan Holesovsky (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 1 14:43:29 UTC 2020
wsd/LOOLWSD.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 22e2f50f556a3eb4ee292301c63a30a252c12b07
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jul 1 12:34:36 2020 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jul 1 16:43:09 2020 +0200
android: Make the documents open again.
The files stopped opening after
5c9988f2e345ca82e7bb5f5e9bf66a30b82a0446, but just avoiding the new
Jails stuff seems enough to fix it.
Change-Id: I4c3be058dd24e9500f64c240571f0e76a17ac8b8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97608
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3d3f2f290..a93b41f5f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1205,6 +1205,7 @@ void LOOLWSD::initialize(Application& self)
LOG_INF("Creating childroot: " + ChildRoot);
}
+#if !MOBILEAPP
// Setup the jails.
JailUtil::setupJails(getConfigValue<bool>(conf, "mount_jail_tree", true), ChildRoot,
SysTemplate);
@@ -1225,7 +1226,6 @@ void LOOLWSD::initialize(Application& self)
}
LOG_INF("NumPreSpawnedChildren set to " << NumPreSpawnedChildren << '.');
-#if !MOBILEAPP
FileUtil::registerFileSystemForDiskSpaceChecks(ChildRoot);
const auto maxConcurrency = getConfigValue<int>(conf, "per_document.max_concurrency", 4);
More information about the Libreoffice-commits
mailing list