From e19b67dcf5e987e58ce4252d8d1c8313d111df85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 17 Jun 2020 14:54:06 +0100 Subject: [PATCH] allow building as root inside a container without complaint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; \