diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-03-09 13:19:48 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-03-09 13:20:02 +0000 |
| commit | 58daab21cd043e1dc37024a7f99b396788372918 (patch) | |
| tree | 96771e43bb69f7c1c2b0b4f7374cb74d7866d0cb /system/edit-config | |
| parent | Releasing debian version 1.43.2-1. (diff) | |
| download | netdata-58daab21cd043e1dc37024a7f99b396788372918.tar.xz netdata-58daab21cd043e1dc37024a7f99b396788372918.zip | |
Merging upstream version 1.44.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'system/edit-config')
| -rwxr-xr-x | system/edit-config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/edit-config b/system/edit-config index 74f3634c3..3944810d2 100755 --- a/system/edit-config +++ b/system/edit-config @@ -112,8 +112,10 @@ check_editor() { running_in_container() { [ -e /.dockerenv ] && return 0 [ -e /.dockerinit ] && return 0 - [ -r /proc/1/environ ] && tr '\000' '\n' </proc/1/environ | grep -Eiq '^container=podman' && return 0 + [ -e /run/.containerenv ] && return 0 + [ -r /proc/1/environ ] && tr '\000' '\n' </proc/1/environ | grep -Eiq 'container=' && return 0 grep -qF -e /docker/ -e /libpod- /proc/self/cgroup 2>/dev/null && return 0 + return 1 } get_docker_command() { |