merge branch 'upstreamMaster'

2 files changed, 7 insertions, 7 deletions

diff --git a/examples/guided.py b/examples/guided.py
index fa5d4e33..a23c0011 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -192,9 +192,9 @@ def perform_installation(mountpoint):
 			enable_testing = False
 			enable_multilib = False
 
-		if installation.minimal_installation(testing=enable_testing, multilib=enable_multilib):
-			installation.set_locale(archinstall.arguments['sys-language'], archinstall.arguments['sys-encoding'].upper())
-			installation.set_hostname(archinstall.arguments['hostname'])
+		if installation.minimal_installation(
+				testing=enable_testing, multilib=enable_multilib, hostname=archinstall.arguments['hostname'],
+				locales=[f"{archinstall.arguments['sys-language']} {archinstall.arguments['sys-encoding'].upper()}"]):
 			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
@@ -278,7 +278,7 @@ def perform_installation(mountpoint):
 	archinstall.log(f"Disk states after installing: {archinstall.disk_layouts()}", level=logging.DEBUG)
 
 
-if not (archinstall.check_mirror_reachable() or archinstall.arguments.get('skip-mirror-check', False)):
+if archinstall.arguments.get('skip-mirror-check', False) is False and archinstall.check_mirror_reachable() is False:
 	log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None))
 	archinstall.log(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red")
 	exit(1)
diff --git a/examples/swiss.py b/examples/swiss.py
index da45cd18..419bd859 100644
--- a/examples/swiss.py
+++ b/examples/swiss.py
@@ -402,9 +402,9 @@ def os_setup(installation):
 	# Set mirrors used by pacstrap (outside of installation)
 	if archinstall.arguments.get('mirror-region', None):
 		archinstall.use_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors for the live medium
-	if installation.minimal_installation():
-		installation.set_locale(archinstall.arguments['sys-language'], archinstall.arguments['sys-encoding'].upper())
-		installation.set_hostname(archinstall.arguments['hostname'])
+	if installation.minimal_installation(
+			hostname=archinstall.arguments['hostname'],
+			locales=[f"{archinstall.arguments['sys-language']} {archinstall.arguments['sys-encoding'].upper()}"]):
 		if archinstall.arguments['mirror-region'].get("mirrors", None) is not None:
 			installation.set_mirrors(
 				archinstall.arguments['mirror-region'])  # Set the mirrors in the installation medium