[Libreoffice-commits] online.git: Branch 'private/hcvcastro/bind-mount' - loolwsd/loolwsd-systemplate-setup

[Henry Castro]

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

New commits:
commit e96ef835f33107cea10aa0a10a2a03c3766d0d7e
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed Dec 9 09:45:16 2015 -0400

    loolwsd: hard link or copy LO installation to systemplate

diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd/loolwsd-systemplate-setup
index 627f230..efa4633 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -91,8 +91,12 @@ cd / || exit 1
 # This will now copy the file a symlink points to, but whatever.
 cpio -p -d -L $CHROOT
 
+mkdir -p $CHROOT/lo
 mkdir -p $CHROOT/tmp
 
+echo "Copying: $INSTDIR to $CHROOT/lo";
+cp -lr -t $CHROOT/lo $INSTDIR/. || cp -a -t $CHROOT/lo $INSTDIR/.
+
 # /usr/share/fonts needs to be taken care of separately because the
 # directory time stamps must be preserved are for fontconfig to trust
 # its cache.