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

Debugging some tweaks

This commit is contained in:
Anton Hvornum 2021-03-09 11:07:46 +01:00
parent f230140ba9
commit 56d673d2a5
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archinstall/lib/disk.py
View File

@ -146,7 +146,7 @@ class Partition():
self.mount(mountpoint) self.mount(mountpoint)
mount_information = get_mount_info(self.path) mount_information = get_mount_info(self.path)
fstype = get_filesystem_type(self.path) # blkid -o value -s TYPE self.path fstype = get_filesystem_type(self.real_device) # blkid -o value -s TYPE self.path
if self.mountpoint != mount_information.get('target', None) and mountpoint: if self.mountpoint != mount_information.get('target', None) and mountpoint:
raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information.get('target', None)}") raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information.get('target', None)}")
@ -175,6 +175,16 @@ class Partition():
else: else:
return f'Partition(path={self.path}, fs={self.filesystem}{mount_repr})' return f'Partition(path={self.path}, fs={self.filesystem}{mount_repr})'
@property
def real_device(self):
if not self.encrypted:
return self.path
else:
for blockdevice in json.loads(b''.join(sys_command('lsblk -J')).decode('UTF-8'))['blockdevices']:
if (parent := self.find_parent_of(blockdevice, os.path.basename(self.path))):
return f"/dev/{parent}"
raise DiskError(f'Could not find appropriate parent for encrypted partition {self}')
def has_content(self): def has_content(self):
temporary_mountpoint = '/tmp/'+hashlib.md5(bytes(f"{time.time()}", 'UTF-8')+os.urandom(12)).hexdigest() temporary_mountpoint = '/tmp/'+hashlib.md5(bytes(f"{time.time()}", 'UTF-8')+os.urandom(12)).hexdigest()
temporary_path = pathlib.Path(temporary_mountpoint) temporary_path = pathlib.Path(temporary_mountpoint)
@ -277,16 +287,6 @@ class Partition():
if (parent := self.find_parent_of(child, name, parent=data['name'])): if (parent := self.find_parent_of(child, name, parent=data['name'])):
return parent return parent
@property
def real_device(self):
if not self.encrypted:
return self.path
else:
for blockdevice in json.loads(b''.join(sys_command('lsblk -J')).decode('UTF-8'))['blockdevices']:
if (parent := self.find_parent_of(blockdevice, os.path.basename(self.path))):
return f"/dev/{parent}"
raise DiskError(f'Could not find appropriate parent for encrypted partition {self}')
def mount(self, target, fs=None, options=''): def mount(self, target, fs=None, options=''):
if not self.mountpoint: if not self.mountpoint:
log(f'Mounting {self} to {target}', level=LOG_LEVELS.Info) log(f'Mounting {self} to {target}', level=LOG_LEVELS.Info)