From 977976f88e761ced7d5bc9f39b32e2296ee91806 Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Mon, 3 Oct 2022 10:42:10 -0400 Subject: Add hostname and locales as parameters to `minimal_installation()` (#1458) --- examples/guided.py | 6 +++--- examples/swiss.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/guided.py b/examples/guided.py index 6f289caa..ad178207 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 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 -- cgit v1.2.3-70-g09d2 From faa93d9e24ec70c96dd516f41cc94950e5f8a611 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 6 Oct 2022 18:56:53 +0200 Subject: Improved speed in --skip-mirror-check (#1505) --- examples/guided.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/guided.py b/examples/guided.py index ad178207..eba78a1a 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -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) -- cgit v1.2.3-70-g09d2