Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-12-07 20:36:06 +0100
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-12-07 20:36:06 +0100
commit21cfe5708cc4864d708fa39c2634d766d92c2a03 (patch)
treefc7e33724b1a5cc783a1dceab03920e78d0b21a7
parent5c8d24a329bd49bb3f8c9d6adf421211aed9893c (diff)
Fixing a strip glitch in `sys_command()` causing certain output to get truncated in unwanted places (like fstab)
-rw-r--r--archinstall/lib/general.py2
-rw-r--r--archinstall/lib/installer.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index 6abef205..203f5fa9 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -171,7 +171,7 @@ class sys_command():#Thread):
while alive and not self.kwargs['emulate']:
for fileno, event in poller.poll(0.1):
try:
- output = os.read(child_fd, 8192).strip()
+ output = os.read(child_fd, 8192)
self.trace_log += output
except OSError:
alive = False
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 889f72d9..5827078c 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -121,7 +121,7 @@ class Installer():
fstab = sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint}').trace_log
print(fstab)
with open(f"{self.mountpoint}/etc/fstab", 'ab') as fstab_fh:
- fstab.write(fstab)
+ fstab_fh.write(fstab)
if not os.path.isfile(f'{self.mountpoint}/etc/fstab'):
raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n{o}')