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

Reverted genfstab changes. 

But placed genfstab in the Installation() __exit__ as the last action performed.
This commit is contained in:
Anton Hvornum 2020-12-07 16:45:49 +01:00
parent 67ce208d25
commit fb429fc866
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/installer.py
View File

@ -78,6 +78,8 @@ class Installer():
if len(args) >= 2 and args[1]: if len(args) >= 2 and args[1]:
raise args[1] raise args[1]
self.genfstab()
if not (missing_steps := self.post_install_check()): 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) self.log('Installation completed without any errors. You may now reboot.', bg='black', fg='green', level=LOG_LEVELS.Info)
return True return True
@ -94,7 +96,6 @@ class Installer():
os.makedirs(f'{self.mountpoint}/srv/http') os.makedirs(f'{self.mountpoint}/srv/http')
partition.mount(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): def post_install_check(self, *args, **kwargs):
return [step for step, flag in self.helper_flags.items() if flag is False] 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): def set_mirrors(self, mirrors):
return use_mirrors(mirrors, destination=f'{self.mountpoint}/etc/pacman.d/mirrorlist') return use_mirrors(mirrors, destination=f'{self.mountpoint}/etc/pacman.d/mirrorlist')
def genfstab(self, flags='-pU', output_operator='>>'): def genfstab(self, flags='-pU'):
o = b''.join(sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint} {output_operator} {self.mountpoint}/etc/fstab')) 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'): 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}') raise RequirementError(f'Could not generate fstab, strapping in packages most likely failed (disk out of space?)\n{o}')
return True return True
@ -186,7 +186,7 @@ class Installer():
self.base_packages.append('btrfs-progs') self.base_packages.append('btrfs-progs')
self.pacstrap(self.base_packages) self.pacstrap(self.base_packages)
self.genfstab() #self.genfstab()
with open(f"{self.mountpoint}/etc/fstab", "a") as fstab: with open(f"{self.mountpoint}/etc/fstab", "a") as fstab:
fstab.write( fstab.write(