[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLWSD.cpp loolwsd/loolwsd-systemplate-setup

[Mihai Varga]

 loolwsd/LOOLWSD.cpp               |    2 +-
 loolwsd/loolwsd-systemplate-setup |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8a371765bceb3a2581c785cc2d57073a078c8907
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Tue Sep 8 13:03:43 2015 +0300

    loolwsd: copy /etc/localtime when running systemplate-setup

diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd/loolwsd-systemplate-setup
index 3d18283..f501ae0 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -30,6 +30,8 @@ cd / || exit 1
 	     lib/libnss_* lib64/libnss_* \
 	     var/cache/fontconfig \
 	     etc/fonts \
+	     etc/localtime \
+	     usr/share/zoneinfo/* \
 	     usr/share/liblangtag \
 	     lib/*-linux-gnu/libnss* \
 		 -type f
commit 564572e5612fe15781d2f2397aab3778a612b01a
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Tue Sep 8 13:03:14 2015 +0300

    loolwsd: also add /etc/host.conf in chroot

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8fc7262..0b12474 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -895,7 +895,7 @@ void LOOLWSD::desktopMain()
     linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
     // We need this because sometimes the hostname is not resolved
-    std::vector<std::string> networkFiles = {"/etc/hosts", "/etc/nsswitch.conf", "/etc/resolv.conf"};
+    std::vector<std::string> networkFiles = {"/etc/host.conf", "/etc/hosts", "/etc/nsswitch.conf", "/etc/resolv.conf"};
     for (std::vector<std::string>::iterator it = networkFiles.begin(); it != networkFiles.end(); ++it)
     {
         File networkFile(*it);