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 16:45:49 +0100
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-12-07 16:45:49 +0100
commitfb429fc866c129449f105b7ecbecd54ea5065a4c (patch)
tree18154f7531db9f9ce7b7a1eed96448d1bcf6c3a0
parent67ce208d25953a0b251eb1109bde592988502544 (diff)
Reverted genfstab changes.
But placed genfstab in the Installation() __exit__ as the last action performed.
-rw-r--r--archinstall/lib/installer.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 01e73186..9d581d75 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -78,6 +78,8 @@ class Installer():
if len(args) >= 2 and args[1]:
raise args[1]
+ self.genfstab()
+
if not (missing_steps := self.post_install_check()):
self.log('Installation completed without any errors. You may now reboot.', bg='black', fg='green', level=LOG_LEVELS.Info)
return True
@@ -94,7 +96,6 @@ class Installer():
os.makedirs(f'{self.mountpoint}/srv/http')
partition.mount(f'{self.mountpoint}/srv/http')
- self.genfstab(output_operator='>') # Replace any existing entries
def post_install_check(self, *args, **kwargs):
return [step for step, flag in self.helper_flags.items() if flag is False]
@@ -114,10 +115,9 @@ class Installer():
def set_mirrors(self, mirrors):
return use_mirrors(mirrors, destination=f'{self.mountpoint}/etc/pacman.d/mirrorlist')
- def genfstab(self, flags='-pU', output_operator='>>'):
- o = b''.join(sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint} {output_operator} {self.mountpoint}/etc/fstab'))
+ def genfstab(self, flags='-pU'):
+ o = b''.join(sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint} >> {self.mountpoint}/etc/fstab'))
if not os.path.isfile(f'{self.mountpoint}/etc/fstab'):
- print(f'/usr/bin/genfstab {flags} {self.mountpoint} {output_operator} {self.mountpoint}/etc/fstab')
raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n{o}')
return True
@@ -186,7 +186,7 @@ class Installer():
self.base_packages.append('btrfs-progs')
self.pacstrap(self.base_packages)
- self.genfstab()
+ #self.genfstab()
with open(f"{self.mountpoint}/etc/fstab", "a") as fstab:
fstab.write(