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

Added a service-started wait timer for keyring.timer (#1858) 

* Added a service-started wait timer for keyring.timer, and then we check the service state for keyring.service. This is because the .service can be 'dead' right from the start without the timer ever have started. This ensures that we wait for the timer to kick in before we monitor for the .service execution

* Removed pacman-init.service wait timer, as we can rely on keyring.timer instead: https://github.com/archlinux/archinstall/issues/1846#issuecomment-1586872920
This commit is contained in:
Anton Hvornum 2023-06-12 10:49:53 +02:00 committed by GitHub
parent 195d779d85
commit f9ce7679fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
archinstall/lib/installer.py
View File

@ -147,12 +147,17 @@ class Installer:
while self._service_state('reflector') not in ('dead', 'failed', 'exited'):
time.sleep(1)
info('Waiting pacman-init.service to complete.')
while self._service_state('pacman-init') not in ('dead', 'failed', 'exited'):
# info('Waiting for pacman-init.service to complete.')
# while self._service_state('pacman-init') not in ('dead', 'failed', 'exited'):
# time.sleep(1)
info('Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete.')
# Wait for the timer to kick in
while self._service_started('archlinux-keyring-wkd-sync.timer') is None:
time.sleep(1)
info('Waiting Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete.')
while self._service_state('archlinux-keyring-wkd-sync') not in ('dead', 'failed', 'exited'):
# Wait for the service to enter a finished state
while self._service_state('archlinux-keyring-wkd-sync.service') not in ('dead', 'failed', 'exited'):
time.sleep(1)
def _verify_boot_part(self):
@ -1206,8 +1211,19 @@ class Installer:
return True
def _service_started(self, service_name: str) -> str | None:
if os.path.splitext(service_name)[1] not in ('.service', '.target', '.timer'):
service_name += '.service' # Just to be safe
last_execution_time = b''.join(SysCommand(f"systemctl show --property=ActiveEnterTimestamp --no-pager {service_name}", environment_vars={'SYSTEMD_COLORS': '0'}))
last_execution_time = last_execution_time.lstrip(b'ActiveEnterTimestamp=').strip()
if not last_execution_time:
return None
return last_execution_time.decode('UTF-8')
def _service_state(self, service_name: str) -> str:
if os.path.splitext(service_name)[1] != '.service':
if os.path.splitext(service_name)[1] not in ('.service', '.target', '.timer'):
service_name += '.service' # Just to be safe
state = b''.join(SysCommand(f'systemctl show --no-pager -p SubState --value {service_name}', environment_vars={'SYSTEMD_COLORS': '0'}))