| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/services.py | 2 | ||||
| -rw-r--r-- | archinstall/lib/user_interaction.py | 6 | ||||
| -rw-r--r-- | examples/guided.py | 8 |
diff --git a/archinstall/lib/services.py b/archinstall/lib/services.py index 048c4879..43051f0f 100644 --- a/archinstall/lib/services.py +++ b/archinstall/lib/services.py @@ -9,5 +9,5 @@ def service_state(service_name :str): state = b''.join(sys_command(f'systemctl show -p SubState --value {service_name}')) - return state.decode('UTF-8') + return state.strip().decode('UTF-8')
\ No newline at end of file diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 8e76ac55..9f939f12 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -58,9 +58,13 @@ def select_mirror_regions(mirrors, show_top_mirrors=True): print(f"{index}: {region}") print(' -- You can enter ? or help to search for more regions --') + print(' -- You can skip this step by leaving the option blank --') print(' -- (You can use Shift + PageUp to scroll in the list --') selected_mirror = input('Select one of the above regions to download packages from (by number or full name): ') - if selected_mirror.lower() in ('?', 'help'): + if len(selected_mirror.strip()) == 0: + return {} + + elif selected_mirror.lower() in ('?', 'help'): filter_string = input('Search for a region containing (example: "united"): ').strip().lower() for region in mirrors: if filter_string in region.lower(): diff --git a/examples/guided.py b/examples/guided.py index 513fd56a..c6e6297c 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -7,9 +7,11 @@ def perform_installation(device, boot_partition, language, mirrors): formatted and setup prior to entering this function. """ with archinstall.Installer(device, boot_partition=boot_partition, hostname=hostname) as installation: - while archinstall.service_state('reflector') != 'dead': - print(archinstall.service_state('reflector')) - time.sleep(0.25) + if len(mirrors): + archinstall.log(f'Waiting for automatic mirror selection has completed before using custom mirrors.') + while archinstall.service_state('reflector') != 'dead': + print(archinstall.service_state('reflector')) + time.sleep(0.25) archinstall.use_mirrors(mirrors) # Set the mirrors for the live medium if installation.minimal_installation(): |