RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaking the mirror selection vs automatic mirror processes.

This commit is contained in:
Anton Hvornum 2020-09-01 14:52:59 +02:00
parent 8494014c3b
commit 4dcafa7ec8
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/services.py
View File

@ -9,5 +9,5 @@ def service_state(service_name :str):
state = b''.join(sys_command(f'systemctl show -p SubState --value {service_name}')) state = b''.join(sys_command(f'systemctl show -p SubState --value {service_name}'))
return state.decode('UTF-8') return state.strip().decode('UTF-8')

6
archinstall/lib/user_interaction.py
View File

@ -58,9 +58,13 @@ def select_mirror_regions(mirrors, show_top_mirrors=True):
print(f"{index}: {region}") print(f"{index}: {region}")
print(' -- You can enter ? or help to search for more regions --') 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 --') 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): ') 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() filter_string = input('Search for a region containing (example: "united"): ').strip().lower()
for region in mirrors: for region in mirrors:
if filter_string in region.lower(): if filter_string in region.lower():

8
examples/guided.py
View File

@ -7,9 +7,11 @@ def perform_installation(device, boot_partition, language, mirrors):
formatted and setup prior to entering this function. formatted and setup prior to entering this function.
""" """
with archinstall.Installer(device, boot_partition=boot_partition, hostname=hostname) as installation: with archinstall.Installer(device, boot_partition=boot_partition, hostname=hostname) as installation:
while archinstall.service_state('reflector') != 'dead': if len(mirrors):
print(archinstall.service_state('reflector')) archinstall.log(f'Waiting for automatic mirror selection has completed before using custom mirrors.')
time.sleep(0.25) 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 archinstall.use_mirrors(mirrors) # Set the mirrors for the live medium
if installation.minimal_installation(): if installation.minimal_installation():