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

Added error handling to fstab (#1045) 

* Added error handling to fstab

* Checking the exit code for == 0
This commit is contained in:
Anton Hvornum 2022-03-28 14:43:33 +02:00 committed by GitHub
parent c92c448f29
commit 77bfa10d53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archinstall/lib/installer.py
View File

@ -380,11 +380,14 @@ class Installer:
def genfstab(self, flags :str = '-pU') -> bool: def genfstab(self, flags :str = '-pU') -> bool:
self.log(f"Updating {self.target}/etc/fstab", level=logging.INFO) 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: 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'): 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(): for plugin in plugins.values():
if hasattr(plugin, 'on_genfstab'): if hasattr(plugin, 'on_genfstab'):

2
archinstall/lib/mirrors.py
View File

@ -150,7 +150,7 @@ def list_mirrors(sort_order :List[str] = ["https", "http"]) -> Dict[str, Any]:
try: try:
response = urllib.request.urlopen(url) response = urllib.request.urlopen(url)
except urllib.error.URLError as err: 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 return regions
mirrorlist = response.read() mirrorlist = response.read()