wsd/LOOLWSD.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 9e8ddfc0c1668067219a1debca2aa5cb8f4c72b4 Author: Tor Lillqvist <[email protected]> AuthorDate: Wed Jul 1 13:48:01 2020 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Wed Jul 1 16:43:56 2020 +0200 Don't call JailUtil::cleanupJails() on MOBILEAPP Change-Id: I7a01ff9afaccb6e3f4b399a12d828c8d44bcb4c2 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97612 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index a93b41f5f..6efb55655 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1185,13 +1185,14 @@ void LOOLWSD::initialize(Application& self) } else { +#if !MOBILEAPP if (CleanupOnly) { // Cleanup and exit. JailUtil::cleanupJails(ChildRoot); std::exit(EX_OK); } - +#endif if (ChildRoot[ChildRoot.size() - 1] != '/') ChildRoot += '/'; commit 22e2f50f556a3eb4ee292301c63a30a252c12b07 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Jul 1 12:34:36 2020 +0200 Commit: Tor Lillqvist <[email protected]> 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 <[email protected]> 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); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
