From: Luca Boccassi <bluca@debian.org>
Date: Wed, 7 Aug 2024 22:35:39 +0000 (+0100)
Subject: distributions: try reading /etc/os-release first
X-Git-Tag: v25~364^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7edaa93d2728dcb8c07b10f4ed7ebcf80994cd7;p=thirdparty%2Fmkosi.git

distributions: try reading /etc/os-release first

It might be a local modification by an image builder, read it first
as per specification instructions
---

diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index f801414b0..c2d24f57d 100644
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -163,9 +163,12 @@ class Distribution(StrEnum):
 
 def detect_distribution() -> tuple[Optional[Distribution], Optional[str]]:
     try:
-        os_release = read_env_file("/usr/lib/os-release")
+        os_release = read_env_file("/etc/os-release")
     except FileNotFoundError:
-        return None, None
+        try:
+            os_release = read_env_file("/usr/lib/os-release")
+        except FileNotFoundError:
+            return None, None
 
     dist_id = os_release.get("ID", "linux")
     dist_id_like = os_release.get("ID_LIKE", "").split()