[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - 2 commits - loolwsd-systemplate-setup

[Libreoffice Gerrit user]

 loolwsd-systemplate-setup |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d861ccb30ce9bf78a76ed6deea4fe14eb22fc5bc
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 1 17:20:10 2018 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Nov 2 05:11:57 2018 +0100

    systemplate: without /etc/nsswitch.conf, /etc/hosts is not read
    
    Change-Id: Id2bee15425f65064db3125042108a8d0f78fa384
    Reviewed-on: https://gerrit.libreoffice.org/62745
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index c1ff66781..5fbeeb12a 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -22,7 +22,7 @@ cd / || exit 1
 
 # First essential files and shared objects
 find etc/passwd etc/group etc/hosts \
-     etc/resolv.conf \
+     etc/resolv.conf etc/nsswitch.conf \
      lib/ld-* lib64/ld-* \
      lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
      lib/libattr* lib/*-linux-gnu/libattr* \
commit 0e74617c26f53786f8fd0331a26bf5ff3fafacde
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Oct 30 21:17:53 2018 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Nov 2 05:11:43 2018 +0100

    /etc/resolv.conf can be a symlink
    
    Change-Id: I23396e598306b7c8ab1498962ab5c09150c6795b
    Reviewed-on: https://gerrit.libreoffice.org/62670
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 56ca87d20..c1ff66781 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -42,6 +42,7 @@ find etc/passwd etc/group etc/hosts \
 	 -type f
 
 find etc/fonts \
+     etc/resolv.conf \
      lib/ld-* lib64/ld-* \
      lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
      lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \