From 934407414e201b271acb6be8fd7b285b8b0eab24 Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Fri, 10 Apr 2026 20:17:29 -0400 Subject: [PATCH] Add constant for mirrorlist (#4403) --- archinstall/lib/installer.py | 11 +++++++---- archinstall/lib/mirror/mirror_handler.py | 3 ++- archinstall/lib/pathnames.py | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 463901fe..ff56e2e1 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -53,7 +53,7 @@ from archinstall.lib.output import debug, error, info, log, logger, warn from archinstall.lib.packages.packages import installed_package from archinstall.lib.pacman.config import PacmanConfig from archinstall.lib.pacman.pacman import Pacman -from archinstall.lib.pathnames import PACMAN_CONF +from archinstall.lib.pathnames import MIRRORLIST, PACMAN_CONF from archinstall.lib.plugins import plugins from archinstall.lib.translationhandler import tr @@ -565,9 +565,12 @@ class Installer: if result := plugin.on_mirrors(mirror_config): mirror_config = result - root = self.target if on_target else Path('/') - mirrorlist_config = root / 'etc/pacman.d/mirrorlist' - pacman_config = root / PACMAN_CONF.relative_to_root() + if on_target: + mirrorlist_config = self.target / MIRRORLIST.relative_to_root() + pacman_config = self.target / PACMAN_CONF.relative_to_root() + else: + mirrorlist_config = MIRRORLIST + pacman_config = PACMAN_CONF repositories_config = mirror_config.repositories_config() if repositories_config: diff --git a/archinstall/lib/mirror/mirror_handler.py b/archinstall/lib/mirror/mirror_handler.py index 66e9d8c8..aab85fce 100644 --- a/archinstall/lib/mirror/mirror_handler.py +++ b/archinstall/lib/mirror/mirror_handler.py @@ -6,12 +6,13 @@ from archinstall.lib.models import MirrorRegion from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3 from archinstall.lib.networking import fetch_data_from_url from archinstall.lib.output import debug, info +from archinstall.lib.pathnames import MIRRORLIST class MirrorListHandler: def __init__( self, - local_mirrorlist: Path = Path('/etc/pacman.d/mirrorlist'), + local_mirrorlist: Path = MIRRORLIST, offline: bool = False, verbose: bool = False, ) -> None: diff --git a/archinstall/lib/pathnames.py b/archinstall/lib/pathnames.py index 7af5be6f..542719e1 100644 --- a/archinstall/lib/pathnames.py +++ b/archinstall/lib/pathnames.py @@ -4,4 +4,5 @@ from typing import Final from archinstall.lib.linux_path import LPath ARCHISO_MOUNTPOINT: Final = Path('/run/archiso/airootfs') +MIRRORLIST: Final = LPath('/etc/pacman.d/mirrorlist') PACMAN_CONF: Final = LPath('/etc/pacman.conf')