summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-11-27 06:44:14 +0100
committerGitHub <noreply@github.com>2023-11-27 06:44:14 +0100
commitc0fbe890be6a5a744d7199ef4f0b8ce21acdd006 (patch)
tree2ca72335e2878900bbf6f2ccdf273cfaa733feff
parentc64a8a4da7dba72a42493a58e3ce235c65b258e8 (diff)
parent0b97bde2cb04cf5e23350798f972abcee4bfe4ee (diff)
downloadvyos-1x-c0fbe890be6a5a744d7199ef4f0b8ce21acdd006.tar.gz
vyos-1x-c0fbe890be6a5a744d7199ef4f0b8ce21acdd006.zip
Merge pull request #2543 from jestabro/check-in-docker
image-tools: T4516: exit grub-update service if running in docker
-rw-r--r--python/vyos/system/image.py5
-rw-r--r--src/system/grub_update.py3
2 files changed, 8 insertions, 0 deletions
diff --git a/python/vyos/system/image.py b/python/vyos/system/image.py
index 6c4e3bba5..c03ce02d5 100644
--- a/python/vyos/system/image.py
+++ b/python/vyos/system/image.py
@@ -261,3 +261,8 @@ def is_live_boot() -> bool:
if boot_type == 'live':
return True
return False
+
+def is_running_as_container() -> bool:
+ if Path('/.dockerenv').exists():
+ return True
+ return False
diff --git a/src/system/grub_update.py b/src/system/grub_update.py
index 366a85344..3c851f0e0 100644
--- a/src/system/grub_update.py
+++ b/src/system/grub_update.py
@@ -41,6 +41,9 @@ if __name__ == '__main__':
if image.is_live_boot():
exit(0)
+ if image.is_running_as_container():
+ exit(0)
+
# Skip everything if update is not required
if not cfg_check_update():
exit(0)