Making sure installation.mount() also triggers genfstab.

Since it's a installation specific mount, we need to re-create genfstab. Also corrected genfstab flags as well as added an option to override the >> (append) operator to become a write-over operator.
This commit is contained in:
Anton Hvornum 2020-12-07 16:36:35 +01:00
parent e637852df0
commit 63c6e0464b
1 changed files with 3 additions and 2 deletions

View File

@ -94,6 +94,7 @@ class Installer():
os.makedirs(f'{self.mountpoint}/srv/http')
partition.mount(f'{self.mountpoint}/srv/http')
self.genfstab(output='>') # 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]
@ -113,8 +114,8 @@ class Installer():
def set_mirrors(self, mirrors):
return use_mirrors(mirrors, destination=f'{self.mountpoint}/etc/pacman.d/mirrorlist')
def genfstab(self, flags='-Pu'):
o = b''.join(sys_command(f'/usr/bin/genfstab -pU {self.mountpoint} >> {self.mountpoint}/etc/fstab'))
def genfstab(self, flags='-pU', output='>>'):
o = b''.join(sys_command(f'/usr/bin/genfstab {flags} {self.mountpoint} {output} {self.mountpoint}/etc/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}')
return True