diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-17 14:54:06 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-09-25 17:06:46 +0200 |
| commit | 3ec3ef9e40c02dccb4c02e838a6effcc7a8bff8b (patch) | |
| tree | 46e5c8c6cf4e5f30f7a966792d5e997958c3c5c0 | |
| parent | a69308e46af927bf6c73e2b5360f70d627ff1bfe (diff) | |
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>
(cherry picked from commit e19b67dcf5e987e58ce4252d8d1c8313d111df85)
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 3aa70bba16af..23771facb25d 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 && ! 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; \ |