Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions archinstall/lib/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
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

Expand Down Expand Up @@ -565,9 +565,12 @@ def set_mirrors(
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:
Expand Down
3 changes: 2 additions & 1 deletion archinstall/lib/mirror/mirror_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
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:
Expand Down
1 change: 1 addition & 0 deletions archinstall/lib/pathnames.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
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')
Loading