diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2019-09-25 08:35:37 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2019-09-25 08:35:55 -0700 |
| commit | aded8af1c588ad2377758e6d26bd2f3635e65c98 (patch) | |
| tree | 57aaaaef9d0fe87951547bd2afd21bdd3c61baf3 | |
| parent | bin/update-all: handle non-cgroup kernel (diff) | |
| parent | Fix in_docker check. (diff) | |
| download | packages-5-aded8af1c588ad2377758e6d26bd2f3635e65c98.tar.gz packages-5-aded8af1c588ad2377758e6d26bd2f3635e65c98.tar.bz2 packages-5-aded8af1c588ad2377758e6d26bd2f3635e65c98.zip | |
Merge tag 'v7.0.2' into dev/es-7.3v7.0.3
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rwxr-xr-x | bin/update-all.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/update-all.sh b/bin/update-all.sh index 9249478..c05277d 100755 --- a/bin/update-all.sh +++ b/bin/update-all.sh @@ -7,8 +7,13 @@ # to portage-owned files. However, in a Docker environment, the other files # from Portage are NOT available unless --sync IS used. +function in_docker() { + path=/proc/1/cgroups + [[ -e ${path} ]] && grep -qa docker "${path}" +} + # Stuff that we have to do inside Docker: -if [[ -e /proc/1/cgroups ]] && grep -qa docker /proc/1/cgroups && [[ ${1} != "production" ]]; then +if in_docker && [[ ${1} != "production" ]]; then emerge --sync fi |