diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-17 14:54:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-17 17:38:10 +0200 |
| commit | e19b67dcf5e987e58ce4252d8d1c8313d111df85 (patch) | |
| tree | 4f9af42bf9a599f4f7d7f3eb5486484f496fef8c /Makefile.in | |
| parent | sd signature line: implement non-empty geometry during pdf sign (diff) | |
| download | core-e19b67dcf5e987e58ce4252d8d1c8313d111df85.tar.gz core-e19b67dcf5e987e58ce4252d8d1c8313d111df85.zip | |
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 <caolanm@redhat.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
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; \ |