Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/systemd.py
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/lib/systemd.py')
-rw-r--r--archinstall/lib/systemd.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/archinstall/lib/systemd.py b/archinstall/lib/systemd.py
index 44e634fe..417870da 100644
--- a/archinstall/lib/systemd.py
+++ b/archinstall/lib/systemd.py
@@ -90,11 +90,18 @@ class Boot:
log(args[1], level=logging.ERROR, fg='red')
log(f"The error above occured in a temporary boot-up of the installation {self.instance}", level=logging.ERROR, fg="red")
- shutdown = SysCommand(f'systemd-run --machine={self.container_name} --pty /bin/bash -c "shutdown now"')
+ shutdown = None
+
+ try:
+ shutdown = SysCommand(f'systemd-run --machine={self.container_name} --pty shutdown now')
+ except SysCallError as error:
+ if error.exit_code == 256:
+ pass
+
while self.session.is_alive():
time.sleep(0.25)
- if shutdown.exit_code == 0:
+ if self.session.exit_code == 0 or (shutdown and shutdown.exit_code == 0):
storage['active_boot'] = None
else:
raise SysCallError(f"Could not shut down temporary boot of {self.instance}: {shutdown}", exit_code=shutdown.exit_code)