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

Fixed so that partition listing doesn't overwrite on each request, ruining some checks down the line if the filesystem has been formatted or not

This commit is contained in:
Anton Hvornum 2020-07-06 16:23:23 +02:00
parent 94f8d90121
commit 0dfc0d6195
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
helpers/disk.py
View File

@ -16,6 +16,7 @@ class BlockDevice():
def __init__(self, path, info): def __init__(self, path, info):
self.path = path self.path = path
self.info = info self.info = info
self.part_cache = OrderedDict()
@property @property
def device(self): def device(self):
@ -45,7 +46,6 @@ class BlockDevice():
def partitions(self): def partitions(self):
o = b''.join(sys_command(f'partprobe {self.path}')) o = b''.join(sys_command(f'partprobe {self.path}'))
parts = OrderedDict()
#o = b''.join(sys_command('/usr/bin/lsblk -o name -J -b {dev}'.format(dev=dev))) #o = b''.join(sys_command('/usr/bin/lsblk -o name -J -b {dev}'.format(dev=dev)))
o = b''.join(sys_command(f'/usr/bin/lsblk -J {self.path}')) o = b''.join(sys_command(f'/usr/bin/lsblk -J {self.path}'))
if b'not a block device' in o: if b'not a block device' in o:
@ -59,9 +59,11 @@ class BlockDevice():
root_path = f"/dev/{r['blockdevices'][0]['name']}" root_path = f"/dev/{r['blockdevices'][0]['name']}"
for part in r['blockdevices'][0]['children']: for part in r['blockdevices'][0]['children']:
part_id = part['name'][len(os.path.basename(self.path)):] part_id = part['name'][len(os.path.basename(self.path)):]
parts[part_id] = Partition(root_path + part_id, part_id=part_id, size=part['size']) if part_id not in self.part_cache:
## TODO: Force over-write even if in cache?
self.part_cache[part_id] = Partition(root_path + part_id, part_id=part_id, size=part['size'])
return {k: parts[k] for k in sorted(parts)} return {k: self.part_cache[k] for k in sorted(self.part_cache)}
@property @property
def partition(self): def partition(self):
@ -86,26 +88,26 @@ class Partition():
self.size = size # TODO: Refresh? self.size = size # TODO: Refresh?
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
return f'Partition({self.path})' return f'Partition({self.path}, fs={self.filesystem}, mounted={self.mountpoint})'
def format(self, filesystem): def format(self, filesystem):
if filesystem == 'btrfs': if filesystem == 'btrfs':
o = b''.join(sys_command(f'/usr/bin/mkfs.btrfs -f {self.path}')) o = b''.join(sys_command(f'/usr/bin/mkfs.btrfs -f {self.path}'))
if not b'UUID' in o: if not b'UUID' in o:
return False raise DiskError(f'Could not format {self.path} with {filesystem} because: {o}')
self.filesystem = 'btrfs' self.filesystem = 'btrfs'
elif filesystem == 'fat32': elif filesystem == 'fat32':
o = b''.join(sys_command(f'/usr/bin/mkfs.vfat -F32 {self.path}')) o = b''.join(sys_command(f'/usr/bin/mkfs.vfat -F32 {self.path}'))
if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o: if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o:
return None raise DiskError(f'Could not format {self.path} with {filesystem} because: {o}')
return True self.filesystem = 'fat32'
else: else:
raise DiskError(f'Fileformat {filesystem} is not yet implemented.') raise DiskError(f'Fileformat {filesystem} is not yet implemented.')
return True return True
def mount(self, target, fs=None, options=''): def mount(self, target, fs=None, options=''):
if not fs: if not fs:
if not self.filesystem: raise DiskError('Need to format (or define) the filesystem before mounting.') if not self.filesystem: raise DiskError(f'Need to format (or define) the filesystem on {self} before mounting.')
fs = self.filesystem fs = self.filesystem
# TODO: Move this to the BlockDevice or something. # TODO: Move this to the BlockDevice or something.
ret = libc.mount(self.path.encode(), target.encode(), fs.encode(), 0, options.encode()) ret = libc.mount(self.path.encode(), target.encode(), fs.encode(), 0, options.encode())