From 58daab21cd043e1dc37024a7f99b396788372918 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 9 Mar 2024 14:19:48 +0100
Subject: Merging upstream version 1.44.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 system/edit-config | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'system/edit-config')

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() {
-- 
cgit v1.2.3