[Libreoffice-commits] core.git: Makefile.in

[Caolán McNamara (via logerrit)]

 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fbfb54086c10f0107dc7026eaeffd177eda56c3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jan 4 14:52:40 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jan 4 18:35:26 2020 +0100

    allow root under podman
    
    Change-Id: I66dc674aab8dc86c95495754400c5e64b2583599
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86223
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 50b995df7499..9d362ef1b4d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,7 +60,7 @@ else # MAKE_RESTARTS
 all: build
 
 check-if-root:
-	@if test ! `uname` = 'Haiku' -a `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
+	@if test ! `uname` = 'Haiku' -a `id -u` = 0 && ! 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; \