| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/scripts/guided.py | 9 | ||||
| -rw-r--r-- | archinstall/scripts/swiss.py | 9 |
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py index 44b0ae17..f56ce5b4 100644 --- a/archinstall/scripts/guided.py +++ b/archinstall/scripts/guided.py @@ -10,7 +10,6 @@ from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.installer import Installer from archinstall.lib.menu import Menu -from archinstall.lib.mirrors import use_mirrors, add_custom_mirrors from archinstall.lib.models import AudioConfiguration from archinstall.lib.models.bootloader import Bootloader from archinstall.lib.models.network_configuration import NetworkConfiguration @@ -132,12 +131,8 @@ def perform_installation(mountpoint: Path): # generate encryption key files for the mounted luks devices installation.generate_key_files() - # Set mirrors used by pacstrap (outside of installation) if mirror_config := archinstall.arguments.get('mirror_config', None): - if mirror_config.mirror_regions: - use_mirrors(mirror_config.mirror_regions) - if mirror_config.custom_mirrors: - add_custom_mirrors(mirror_config.custom_mirrors) + installation.set_mirrors(mirror_config, on_target=False) installation.minimal_installation( testing=enable_testing, @@ -148,7 +143,7 @@ def perform_installation(mountpoint: Path): ) if mirror_config := archinstall.arguments.get('mirror_config', None): - installation.set_mirrors(mirror_config) # Set the mirrors in the installation medium + installation.set_mirrors(mirror_config, on_target=True) if archinstall.arguments.get('swap'): installation.setup_swap('zram') diff --git a/archinstall/scripts/swiss.py b/archinstall/scripts/swiss.py index 1db304a8..8a5488bc 100644 --- a/archinstall/scripts/swiss.py +++ b/archinstall/scripts/swiss.py @@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Any, Dict, Optional import archinstall from archinstall import SysInfo, info, debug -from archinstall.lib import mirrors from archinstall.lib import models from archinstall.lib import disk from archinstall.lib import locale @@ -188,12 +187,8 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode): # generate encryption key files for the mounted luks devices installation.generate_key_files() - # Set mirrors used by pacstrap (outside of installation) if mirror_config := archinstall.arguments.get('mirror_config', None): - if mirror_config.mirror_regions: - mirrors.use_mirrors(mirror_config.mirror_regions) - if mirror_config.custom_mirrors: - mirrors.add_custom_mirrors(mirror_config.custom_mirrors) + installation.set_mirrors(mirror_config) installation.minimal_installation( testing=enable_testing, @@ -203,7 +198,7 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode): ) if mirror_config := archinstall.arguments.get('mirror_config', None): - installation.set_mirrors(mirror_config) # Set the mirrors in the installation medium + installation.set_mirrors(mirror_config, on_target=True) if archinstall.arguments.get('swap'): installation.setup_swap('zram') |