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

Refactor set_mirrors() (#3011)

This commit is contained in:
codefiles 2024-12-07 23:07:17 -05:00 committed by GitHub
parent ae3b0f8d75
commit 4592280baa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archinstall/lib/installer.py
View File

@ -478,27 +478,21 @@ class Installer:
if result := plugin.on_mirrors(mirror_config): if result := plugin.on_mirrors(mirror_config):
mirror_config = result mirror_config = result
if on_target:
local_pacman_conf = Path(f'{self.target}/etc/pacman.conf')
local_mirrorlist_conf = Path(f'{self.target}/etc/pacman.d/mirrorlist')
else:
local_pacman_conf = Path('/etc/pacman.conf')
local_mirrorlist_conf = Path('/etc/pacman.d/mirrorlist')
mirrorlist_config = mirror_config.mirrorlist_config(speed_sort=True) mirrorlist_config = mirror_config.mirrorlist_config(speed_sort=True)
pacman_config = mirror_config.pacman_config() pacman_config = mirror_config.pacman_config()
root = self.target if on_target else Path('/')
if pacman_config: if pacman_config:
debug(f'Pacman config: {pacman_config}') debug(f'Pacman config: {pacman_config}')
with local_pacman_conf.open('a') as fp: with open(root / 'etc/pacman.conf', 'a') as fp:
fp.write(pacman_config) fp.write(pacman_config)
if mirrorlist_config: if mirrorlist_config:
debug(f'Mirrorlist: {mirrorlist_config}') debug(f'Mirrorlist: {mirrorlist_config}')
with local_mirrorlist_conf.open('w') as fp: (root / 'etc/pacman.d/mirrorlist').write_text(mirrorlist_config)
fp.write(mirrorlist_config)
def genfstab(self, flags: str = '-pU') -> None: def genfstab(self, flags: str = '-pU') -> None:
fstab_path = self.target / "etc" / "fstab" fstab_path = self.target / "etc" / "fstab"