diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-04 14:52:40 +0000 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-06 19:04:15 +0200 |
| commit | ac7b16f82a9a48e90583eee5922de7368f743654 (patch) | |
| tree | 7da27705eff71b9cf051d1d018bf767a1bb9e2c7 | |
| parent | 35adbb0b38fb0a96e29e651cf5c701ddb2074c76 (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>
(cherry picked from commit 6fbfb54086c10f0107dc7026eaeffd177eda56c3)
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 393e94fda331..c3724534e530 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; \ |