RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add constant for mirrorlist (#4403)

This commit is contained in:
codefiles 2026-04-10 20:17:29 -04:00 committed by GitHub
parent 1a4eedf868
commit 934407414e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall/lib/installer.py
View File

@ -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.packages.packages import installed_package
from archinstall.lib.pacman.config import PacmanConfig from archinstall.lib.pacman.config import PacmanConfig
from archinstall.lib.pacman.pacman import Pacman 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.plugins import plugins
from archinstall.lib.translationhandler import tr from archinstall.lib.translationhandler import tr
@ -565,9 +565,12 @@ class Installer:
if result := plugin.on_mirrors(mirror_config): if result := plugin.on_mirrors(mirror_config):
mirror_config = result mirror_config = result
root = self.target if on_target else Path('/') if on_target:
mirrorlist_config = root / 'etc/pacman.d/mirrorlist' mirrorlist_config = self.target / MIRRORLIST.relative_to_root()
pacman_config = root / PACMAN_CONF.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() repositories_config = mirror_config.repositories_config()
if repositories_config: if repositories_config:

3
archinstall/lib/mirror/mirror_handler.py
View File

@ -6,12 +6,13 @@ from archinstall.lib.models import MirrorRegion
from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3 from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3
from archinstall.lib.networking import fetch_data_from_url from archinstall.lib.networking import fetch_data_from_url
from archinstall.lib.output import debug, info from archinstall.lib.output import debug, info
from archinstall.lib.pathnames import MIRRORLIST
class MirrorListHandler: class MirrorListHandler:
def __init__( def __init__(
self, self,
local_mirrorlist: Path = Path('/etc/pacman.d/mirrorlist'), local_mirrorlist: Path = MIRRORLIST,
offline: bool = False, offline: bool = False,
verbose: bool = False, verbose: bool = False,
) -> None: ) -> None:

1
archinstall/lib/pathnames.py
View File

@ -4,4 +4,5 @@ from typing import Final
from archinstall.lib.linux_path import LPath from archinstall.lib.linux_path import LPath
ARCHISO_MOUNTPOINT: Final = Path('/run/archiso/airootfs') ARCHISO_MOUNTPOINT: Final = Path('/run/archiso/airootfs')
MIRRORLIST: Final = LPath('/etc/pacman.d/mirrorlist')
PACMAN_CONF: Final = LPath('/etc/pacman.conf') PACMAN_CONF: Final = LPath('/etc/pacman.conf')