Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e19b67dcf5e987e58ce4252d8d1c8313d111df85
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jun 17 14:54:06 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jun 17 17:38:10 2020 +0200
allow building as root inside a container without complaint
add a check for $container
Change-Id: Ib6921c6d771622fb5f4acb82d10aa6fb34e1bbac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96538
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/Makefile.in b/Makefile.in
index 6af416b8a2f9..fe64e37dee7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ else # MAKE_RESTARTS
.DEFAULT_GOAL := build
check-if-root:
- @if test ! `uname` = 'Haiku' -a `id -u` = 0 && ! grep -q 'lxc\|docker'
/proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \
+ @if test ! `uname` = 'Haiku' -a `id -u` = 0 && test -z $$container && !
grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent'
/proc/self/cgroup; then \
echo; \
echo 'Building LibreOffice as root is a very bad idea, use a
regular user.'; \
echo; \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
