Add custom mirror support (#1816)

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py
index 487db4dd..7c4ffed7 100644
--- a/examples/interactive_installation.py
+++ b/examples/interactive_installation.py
@@ -24,7 +24,7 @@ def ask_user_questions():
 	global_menu.enable('keyboard-layout')
 
 	# Set which region to download packages from during the installation
-	global_menu.enable('mirror-region')
+	global_menu.enable('mirror_config')
 
 	global_menu.enable('sys-language')
 
@@ -116,8 +116,11 @@ def perform_installation(mountpoint: Path):
 				installation.generate_key_files()
 
 		# Set mirrors used by pacstrap (outside of installation)
-		if archinstall.arguments.get('mirror-region', None):
-			mirrors.use_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors for the live medium
+		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.minimal_installation(
 			testing=enable_testing,
@@ -126,9 +129,8 @@ def perform_installation(mountpoint: Path):
 			locales=[locale]
 		)
 
-		if archinstall.arguments.get('mirror-region') is not None:
-			if archinstall.arguments.get("mirrors", None) is not None:
-				installation.set_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors in the installation medium
+		if mirror_config := archinstall.arguments.get('mirror_config', None):
+			installation.set_mirrors(mirror_config)  # Set the mirrors in the installation medium
 
 		if archinstall.arguments.get('swap'):
 			installation.setup_swap('zram')