summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-01-04 14:52:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-01-04 18:35:26 +0100
commit6fbfb54086c10f0107dc7026eaeffd177eda56c3 (patch)
tree270620566f8b9267d4b3154ad499c02d66fb0857 /Makefile.in
parentb0a468d75ff96955e9e53027d35b248235cb68d0 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in2
1 files changed, 1 insertions, 1 deletions
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; \