]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Allow detect_distribution() to read from root directory
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 2 Oct 2024 11:14:28 +0000 (13:14 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 2 Oct 2024 16:28:01 +0000 (18:28 +0200)
mkosi/distributions/__init__.py

index d883c826e6441001c29bff7b920b2e4f42935df8..e152e6dfb70a851b2627a97d6ea927c9d97f5c94 100644 (file)
@@ -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