Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2023-02-27 09:43:26 +0100
committerGitHub <noreply@github.com>2023-02-27 09:43:26 +0100
commit50d20f0b809758d067bc23f6c8bf2a36f61cc738 (patch)
treea436f23cdbee98e5e279fd436a7bc5e565f47ffe /examples
parentea029ed3f9b1bd63c878d42649c29b3ba8ba249b (diff)
Added more services that we need to wait for. (#1647)
* Added more services that we need to wait for. * Fixed small issue with previous commit not checking if disk_encryption is None or not.
Diffstat (limited to 'examples')
-rw-r--r--examples/guided.py24
1 files changed, 16 insertions, 8 deletions
diff --git a/examples/guided.py b/examples/guided.py
index e242138e..e0753834 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -146,14 +146,6 @@ def perform_installation(mountpoint):
if partition.size < 0.19: # ~200 MiB in GiB
raise archinstall.DiskError(f"The selected /boot partition in use is not large enough to properly install a boot loader. Please resize it to at least 200MiB and re-run the installation.")
- # if len(mirrors):
- # Certain services might be running that affects the system during installation.
- # Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
- # We need to wait for it before we continue since we opted in to use a custom mirror/region.
- installation.log('Waiting for automatic mirror selection (reflector) to complete.', level=logging.INFO)
- while archinstall.service_state('reflector') not in ('dead', 'failed'):
- time.sleep(1)
-
# If we've activated NTP, make sure it's active in the ISO too and
# make sure at least one time-sync finishes before we continue with the installation
if archinstall.arguments.get('ntp', False):
@@ -175,6 +167,22 @@ def perform_installation(mountpoint):
installation.log(f"Waiting for timedatectl timesync-status to report a timesync against a server", level=logging.INFO)
logged = True
time.sleep(1)
+
+ # if len(mirrors):
+ # Certain services might be running that affects the system during installation.
+ # Currently, only one such service is "reflector.service" which updates /etc/pacman.d/mirrorlist
+ # We need to wait for it before we continue since we opted in to use a custom mirror/region.
+ installation.log('Waiting for automatic mirror selection (reflector) to complete.', level=logging.INFO)
+ while archinstall.service_state('reflector') not in ('dead', 'failed'):
+ time.sleep(1)
+
+ installation.log('Waiting pacman-init.service to complete.', level=logging.INFO)
+ while archinstall.service_state('pacman-init') not in ('dead', 'failed'):
+ time.sleep(1)
+
+ installation.log('Waiting Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete.', level=logging.INFO)
+ while archinstall.service_state('archlinux-keyring-wkd-sync') not in ('dead', 'failed'):
+ time.sleep(1)
# Set mirrors used by pacstrap (outside of installation)
if archinstall.arguments.get('mirror-region', None):