[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - kit/Kit.cpp

[Tamas Bunth]

 kit/Kit.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cd370fc1b555cebc87109aa8dc125c812248fc6b
Author: Tamas Bunth <tamas.bunth at collabora.co.uk>
Date:   Wed Aug 16 16:14:59 2017 +0200

    Copy file with linkOrCopy
    
    So that it can create folder in jails when needed.
    
    (cherry picked from commit b285c5f321ebac5496b40399aede2e6b8c6cb1af)
    
    Change-Id: I6986a4150020adc96d633ee1fc6afa302cf19195
    Reviewed-on: https://gerrit.libreoffice.org/49004
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index bb10f534..a212a138 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1672,11 +1672,11 @@ void lokit_main(const std::string& childRoot,
             const auto networkFiles = {"/etc/host.conf", "/etc/hosts", "/etc/nsswitch.conf", "/etc/resolv.conf"};
             for (const auto& filename : networkFiles)
             {
-                const auto etcPath = Path(jailPath, filename).toString();
-                const File networkFile(filename);
-                if (networkFile.exists() && !File(etcPath).exists())
+                const auto etcPath = Path(jailPath, filename);
+                const auto etcPathString = etcPath.toString();
+                if (File(filename).exists() && !File(etcPathString).exists() )
                 {
-                    networkFile.copyTo(etcPath);
+                    linkOrCopy( filename, etcPath, LinkOrCopyType::LO );
                 }
             }