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

[Michael Meeks (via logerrit)]

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

New commits:
commit 37ec181137dfadea0960b266bf7a3342661d0902
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Oct 25 11:24:33 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Oct 30 11:09:06 2019 +0100

    Copy linked /etc/localtime (and also timezone) into the systemplate.
    
    Change-Id: I77fc24aa0f2fc94ee889a87bc10332c85ea57808
    Reviewed-on: https://gerrit.libreoffice.org/81497
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 09d5265fc..2500beac4 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -28,6 +28,7 @@ find etc/hosts etc/nsswitch.conf etc/resolv.conf \
      lib/libresolv* lib64/libresolv* lib/*/libresolv* \
      var/cache/fontconfig \
      etc/fonts \
+     etc/timezone \
      etc/localtime \
      usr/lib/locale/en_US.utf8 \
      usr/lib/locale/C.UTF-8 \
@@ -40,6 +41,8 @@ find etc/hosts etc/nsswitch.conf etc/resolv.conf \
 	 -type f 2>/dev/null
 
 find etc/fonts \
+     etc/timezone \
+     etc/localtime \
      etc/resolv.conf \
      lib/ld-* lib64/ld-* \
      lib/libnss_* lib64/libnss_* lib/*/libnss_* \