From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 2 Oct 2024 11:14:28 +0000 (+0200)
Subject: Allow detect_distribution() to read from root directory
X-Git-Tag: v25~245^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d47194903c3fdbac55b31b4d7159de0b6cf5ddd8;p=thirdparty%2Fmkosi.git

Allow detect_distribution() to read from root directory
---

diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index d883c826e..e152e6dfb 100644
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -4,6 +4,7 @@ import enum
 import importlib
 import urllib.parse
 from collections.abc import Sequence
+from pathlib import Path
 from typing import TYPE_CHECKING, Optional, cast
 
 from mkosi.util import StrEnum, read_env_file
@@ -163,12 +164,12 @@ class Distribution(StrEnum):
         return cast(type[DistributionInstaller], installer)
 
 
-def detect_distribution() -> tuple[Optional[Distribution], Optional[str]]:
+def detect_distribution(root: Path = Path("/")) -> tuple[Optional[Distribution], Optional[str]]:
     try:
-        os_release = read_env_file("/etc/os-release")
+        os_release = read_env_file(root / "etc/os-release")
     except FileNotFoundError:
         try:
-            os_release = read_env_file("/usr/lib/os-release")
+            os_release = read_env_file(root / "usr/lib/os-release")
         except FileNotFoundError:
             return None, None