From 77bfa10d53bb0b18fa775b06596c6463e06e602b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 28 Mar 2022 14:43:33 +0200 Subject: Added error handling to fstab (#1045) * Added error handling to fstab * Checking the exit code for == 0 --- archinstall/lib/installer.py | 7 +++++-- archinstall/lib/mirrors.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'archinstall') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 13bca56b..f10b4064 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -380,11 +380,14 @@ class Installer: def genfstab(self, flags :str = '-pU') -> bool: self.log(f"Updating {self.target}/etc/fstab", level=logging.INFO) + if not (fstab := SysCommand(f'/usr/bin/genfstab {flags} {self.target}')).exit_code == 0: + raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n Error: {fstab}') + with open(f"{self.target}/etc/fstab", 'a') as fstab_fh: - fstab_fh.write((fstab := SysCommand(f'/usr/bin/genfstab {flags} {self.target}')).decode()) + fstab_fh.write(fstab.decode()) if not os.path.isfile(f'{self.target}/etc/fstab'): - raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n{fstab}') + raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n Error: {fstab}') for plugin in plugins.values(): if hasattr(plugin, 'on_genfstab'): diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py index 6b6bfed4..73921cef 100644 --- a/archinstall/lib/mirrors.py +++ b/archinstall/lib/mirrors.py @@ -150,7 +150,7 @@ def list_mirrors(sort_order :List[str] = ["https", "http"]) -> Dict[str, Any]: try: response = urllib.request.urlopen(url) except urllib.error.URLError as err: - log(f'Could not fetch an active mirror-list: {err}', level=logging.WARNING, fg="yellow") + log(f'Could not fetch an active mirror-list: {err}', level=logging.WARNING, fg="orange") return regions mirrorlist = response.read() -- cgit v1.2.3-70-g09d2