Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archinstall/lib/general.py6
-rw-r--r--archinstall/lib/installer.py4
2 files changed, 8 insertions, 2 deletions
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index 3697cf2d..8dbf23ff 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -440,6 +440,12 @@ class SysCommand:
return val.strip()
return val
+ def output(self) -> bytes:
+ if not self.session:
+ raise ValueError('No session available')
+
+ return self.session._trace_log.replace(b'\r\n', b'\n')
+
@property
def exit_code(self) -> Optional[int]:
if self.session:
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 41113899..d5ea889b 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -362,12 +362,12 @@ class Installer:
info(f"Updating {fstab_path}")
try:
- gen_fstab = SysCommand(f'/usr/bin/genfstab {flags} {self.target}').decode()
+ gen_fstab = SysCommand(f'/usr/bin/genfstab {flags} {self.target}').output()
except SysCallError as err:
raise RequirementError(
f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n Error: {err}')
- with open(fstab_path, 'a') as fp:
+ with open(fstab_path, 'ab') as fp:
fp.write(gen_fstab)
if not fstab_path.is_file():