Added sorting logic for BlockDevice. Also swapped sys_command() to SysCommand() and refined the logic around those calls.
This commit is contained in:
Anton Hvornum
parent
f9774af2cc
commit
ce4b1fbcff
|
|
@ -50,6 +50,9 @@ class BlockDevice:
|
|||
def __len__(self):
|
||||
return len(self.partitions)
|
||||
|
||||
def __lt__(self, left_comparitor):
|
||||
return self.path < left_comparitor.path
|
||||
|
||||
def json(self):
|
||||
"""
|
||||
json() has precedence over __dump__, so this is a way
|
||||
|
|
@ -72,8 +75,7 @@ class BlockDevice:
|
|||
|
||||
@property
|
||||
def partition_type(self):
|
||||
output = b"".join(sys_command(f"lsblk --json -o+PTTYPE {self.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
output = json.loads(SysCommand(f"lsblk --json -o+PTTYPE {self.path}").decode('UTF-8'))
|
||||
|
||||
for device in output['blockdevices']:
|
||||
return device['pttype']
|
||||
|
|
@ -90,7 +92,7 @@ class BlockDevice:
|
|||
raise DiskError(f'Could not locate backplane info for "{self.path}"')
|
||||
|
||||
if self.info['type'] == 'loop':
|
||||
for drive in json.loads(b''.join(SysCommand(['losetup', '--json'])).decode('UTF_8'))['loopdevices']:
|
||||
for drive in json.loads(SysCommand(['losetup', '--json']).decode('UTF_8'))['loopdevices']:
|
||||
if not drive['name'] == self.path:
|
||||
continue
|
||||
|
||||
|
|
@ -112,18 +114,17 @@ class BlockDevice:
|
|||
|
||||
@property
|
||||
def partitions(self):
|
||||
o = b''.join(SysCommand(['partprobe', self.path]))
|
||||
SysCommand(['partprobe', self.path])
|
||||
|
||||
# o = b''.join(sys_command('/usr/bin/lsblk -o name -J -b {dev}'.format(dev=dev)))
|
||||
o = b''.join(SysCommand(['/usr/bin/lsblk', '-J', self.path]))
|
||||
result = SysCommand(['/usr/bin/lsblk', '-J', self.path])
|
||||
|
||||
if b'not a block device' in o:
|
||||
if b'not a block device' in result:
|
||||
raise DiskError(f'Can not read partitions off something that isn\'t a block device: {self.path}')
|
||||
|
||||
if not o[:1] == b'{':
|
||||
if not result[:1] == b'{':
|
||||
raise DiskError('Error getting JSON output from:', f'/usr/bin/lsblk -J {self.path}')
|
||||
|
||||
r = json.loads(o.decode('UTF-8'))
|
||||
r = json.loads(result.decode('UTF-8'))
|
||||
if len(r['blockdevices']) and 'children' in r['blockdevices'][0]:
|
||||
root_path = f"/dev/{r['blockdevices'][0]['name']}"
|
||||
for part in r['blockdevices'][0]['children']:
|
||||
|
|
@ -152,14 +153,12 @@ class BlockDevice:
|
|||
This is more reliable than relying on /dev/disk/by-partuuid as
|
||||
it doesn't seam to be able to detect md raid partitions.
|
||||
"""
|
||||
lsblk = b''.join(SysCommand(f'lsblk -J -o+UUID {self.path}'))
|
||||
for partition in json.loads(lsblk.decode('UTF-8'))['blockdevices']:
|
||||
for partition in json.loads(SysCommand(f'lsblk -J -o+UUID {self.path}').decode('UTF-8'))['blockdevices']:
|
||||
return partition.get('uuid', None)
|
||||
|
||||
@property
|
||||
def size(self):
|
||||
output = b"".join(sys_command(f"lsblk --json -o+SIZE {self.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
output = json.loads(SysCommand(f"lsblk --json -o+SIZE {self.path}").decode('UTF-8'))
|
||||
|
||||
for device in output['blockdevices']:
|
||||
assert device['size'][-1] == 'G' # Make sure we're counting in Gigabytes, otherwise the next logic fails.
|
||||
|
|
@ -250,16 +249,14 @@ class Partition:
|
|||
|
||||
@property
|
||||
def sector_size(self):
|
||||
output = b"".join(sys_command(f"lsblk --json -o+LOG-SEC {self.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
output = json.loads(SysCommand(f"lsblk --json -o+LOG-SEC {self.path}").decode('UTF-8'))
|
||||
|
||||
for device in output['blockdevices']:
|
||||
return device.get('log-sec', None)
|
||||
|
||||
@property
|
||||
def start(self):
|
||||
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
output = json.loads(SysCommand(f"sfdisk --json {self.block_device.path}").decode('UTF-8'))
|
||||
|
||||
for partition in output.get('partitiontable', {}).get('partitions', []):
|
||||
if partition['node'] == self.path:
|
||||
|
|
@ -268,8 +265,7 @@ class Partition:
|
|||
@property
|
||||
def end(self):
|
||||
# TODO: Verify that the logic holds up, that 'size' is the size without 'start' added to it.
|
||||
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
output = json.loads(SysCommand(f"sfdisk --json {self.block_device.path}").decode('UTF-8'))
|
||||
|
||||
for partition in output.get('partitiontable', {}).get('partitions', []):
|
||||
if partition['node'] == self.path:
|
||||
|
|
@ -277,8 +273,7 @@ class Partition:
|
|||
|
||||
@property
|
||||
def boot(self):
|
||||
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
output = json.loads(SysCommand(f"sfdisk --json {self.block_device.path}").decode('UTF-8'))
|
||||
|
||||
# Get the bootable flag from the sfdisk output:
|
||||
# {
|
||||
|
|
@ -302,10 +297,9 @@ class Partition:
|
|||
|
||||
@property
|
||||
def partition_type(self):
|
||||
output = b"".join(sys_command(f"lsblk --json -o+PTTYPE {self.path}"))
|
||||
output = json.loads(output.decode('UTF-8'))
|
||||
lsblk = json.loads(SysCommand(f"lsblk --json -o+PTTYPE {self.path}").decode('UTF-8'))
|
||||
|
||||
for device in output['blockdevices']:
|
||||
for device in lsblk['blockdevices']:
|
||||
return device['pttype']
|
||||
|
||||
@property
|
||||
|
|
@ -315,8 +309,8 @@ class Partition:
|
|||
This is more reliable than relying on /dev/disk/by-partuuid as
|
||||
it doesn't seam to be able to detect md raid partitions.
|
||||
"""
|
||||
lsblk = b''.join(SysCommand(f'lsblk -J -o+PARTUUID {self.path}'))
|
||||
for partition in json.loads(lsblk.decode('UTF-8'))['blockdevices']:
|
||||
lsblk = json.loads(SysCommand(f'lsblk -J -o+PARTUUID {self.path}').decode('UTF-8'))
|
||||
for partition in lsblk['blockdevices']:
|
||||
return partition.get('partuuid', None)
|
||||
return None
|
||||
|
||||
|
|
@ -335,7 +329,7 @@ class Partition:
|
|||
|
||||
@property
|
||||
def real_device(self):
|
||||
for blockdevice in json.loads(b''.join(SysCommand('lsblk -J')).decode('UTF-8'))['blockdevices']:
|
||||
for blockdevice in json.loads(SysCommand('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}')
|
||||
|
|
@ -429,30 +423,29 @@ class Partition:
|
|||
log(f'Formatting {path} -> {filesystem}', level=logging.INFO)
|
||||
|
||||
if filesystem == 'btrfs':
|
||||
o = b''.join(SysCommand(f'/usr/bin/mkfs.btrfs -f {path}'))
|
||||
if b'UUID' not in o:
|
||||
raise DiskError(f'Could not format {path} with {filesystem} because: {o}')
|
||||
if b'UUID' not in (mkfs := SysCommand(f'/usr/bin/mkfs.btrfs -f {path}')):
|
||||
raise DiskError(f'Could not format {path} with {filesystem} because: {mkfs}')
|
||||
self.filesystem = 'btrfs'
|
||||
|
||||
elif filesystem == 'vfat':
|
||||
o = b''.join(SysCommand(f'/usr/bin/mkfs.vfat -F32 {path}'))
|
||||
if (b'mkfs.fat' not in o and b'mkfs.vfat' not in o) or b'command not found' in o:
|
||||
raise DiskError(f'Could not format {path} with {filesystem} because: {o}')
|
||||
mkfs = SysCommand(f'/usr/bin/mkfs.vfat -F32 {path}')
|
||||
if (b'mkfs.fat' not in mkfs and b'mkfs.vfat' not in mkfs) or b'command not found' in mkfs:
|
||||
raise DiskError(f"Could not format {path} with {filesystem} because: {mkfs}")
|
||||
self.filesystem = 'vfat'
|
||||
|
||||
elif filesystem == 'ext4':
|
||||
if (handle := SysCommand(f'/usr/bin/mkfs.ext4 -F {path}')).exit_code != 0:
|
||||
raise DiskError(f'Could not format {path} with {filesystem} because: {b"".join(handle)}')
|
||||
raise DiskError(f"Could not format {path} with {filesystem} because: {handle.decode('UTF-8')}")
|
||||
self.filesystem = 'ext4'
|
||||
|
||||
elif filesystem == 'xfs':
|
||||
if (handle := SysCommand(f'/usr/bin/mkfs.xfs -f {path}')).exit_code != 0:
|
||||
raise DiskError(f'Could not format {path} with {filesystem} because: {b"".join(handle)}')
|
||||
raise DiskError(f"Could not format {path} with {filesystem} because: {handle.decode('UTF-8')}")
|
||||
self.filesystem = 'xfs'
|
||||
|
||||
elif filesystem == 'f2fs':
|
||||
if (handle := SysCommand(f'/usr/bin/mkfs.f2fs -f {path}')).exit_code != 0:
|
||||
raise DiskError(f'Could not format {path} with {filesystem} because: {b"".join(handle)}')
|
||||
raise DiskError(f"Could not format {path} with {filesystem} because: {handle.decode('UTF-8')}")
|
||||
self.filesystem = 'f2fs'
|
||||
|
||||
elif filesystem == 'crypto_LUKS':
|
||||
|
|
@ -491,9 +484,9 @@ class Partition:
|
|||
|
||||
try:
|
||||
if options:
|
||||
SysCommand(f'/usr/bin/mount -o {options} {self.path} {target}')
|
||||
SysCommand(f"/usr/bin/mount -o {options} {self.path} {target}")
|
||||
else:
|
||||
SysCommand(f'/usr/bin/mount {self.path} {target}')
|
||||
SysCommand(f"/usr/bin/mount {self.path} {target}")
|
||||
except SysCallError as err:
|
||||
raise err
|
||||
|
||||
|
|
@ -502,7 +495,7 @@ class Partition:
|
|||
|
||||
def unmount(self):
|
||||
try:
|
||||
exit_code = SysCommand(f'/usr/bin/umount {self.path}').exit_code
|
||||
SysCommand(f"/usr/bin/umount {self.path}")
|
||||
except SysCallError as err:
|
||||
exit_code = err.exit_code
|
||||
|
||||
|
|
@ -552,7 +545,7 @@ class Filesystem:
|
|||
else:
|
||||
raise DiskError('Problem setting the partition format to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt')
|
||||
elif self.mode == MBR:
|
||||
if SysCommand(f'/usr/bin/parted -s {self.blockdevice.device} mklabel msdos').exit_code == 0:
|
||||
if SysCommand(f"/usr/bin/parted -s {self.blockdevice.device} mklabel msdos").exit_code == 0:
|
||||
return self
|
||||
else:
|
||||
raise DiskError('Problem setting the partition format to MBR:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel msdos')
|
||||
|
|
@ -574,7 +567,7 @@ class Filesystem:
|
|||
# TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager
|
||||
if len(args) >= 2 and args[1]:
|
||||
raise args[1]
|
||||
b''.join(SysCommand('sync'))
|
||||
SysCommand('sync')
|
||||
return True
|
||||
|
||||
def find_partition(self, mountpoint):
|
||||
|
|
@ -583,8 +576,7 @@ class Filesystem:
|
|||
return partition
|
||||
|
||||
def raw_parted(self, string: str):
|
||||
x = SysCommand(f'/usr/bin/parted -s {string}')
|
||||
return x
|
||||
return SysCommand(f'/usr/bin/parted -s {string}')
|
||||
|
||||
def parted(self, string: str):
|
||||
"""
|
||||
|
|
@ -673,8 +665,9 @@ def device_state(name, *args, **kwargs):
|
|||
def all_disks(*args, **kwargs):
|
||||
kwargs.setdefault("partitions", False)
|
||||
drives = {}
|
||||
# for drive in json.loads(sys_command(f'losetup --json', *args, **lkwargs, hide_from_log=True)).decode('UTF_8')['loopdevices']:
|
||||
for drive in json.loads(b''.join(SysCommand('lsblk --json -l -n -o path,size,type,mountpoint,label,pkname,model')).decode('UTF_8'))['blockdevices']:
|
||||
|
||||
lsblk = json.loads(SysCommand('lsblk --json -l -n -o path,size,type,mountpoint,label,pkname,model').decode('UTF_8'))
|
||||
for drive in lsblk['blockdevices']:
|
||||
if not kwargs['partitions'] and drive['type'] == 'part':
|
||||
continue
|
||||
|
||||
|
|
@ -707,12 +700,10 @@ def harddrive(size=None, model=None, fuzzy=False):
|
|||
|
||||
def get_mount_info(path) -> dict:
|
||||
try:
|
||||
output = SysCommand(f'/usr/bin/findmnt --json {path}')
|
||||
output = SysCommand(f'/usr/bin/findmnt --json {path}').decode('UTF-8')
|
||||
except SysCallError:
|
||||
return {}
|
||||
|
||||
output = output.decode('UTF-8')
|
||||
|
||||
if not output:
|
||||
return {}
|
||||
|
||||
|
|
@ -726,14 +717,12 @@ def get_mount_info(path) -> dict:
|
|||
|
||||
def get_partitions_in_use(mountpoint) -> list:
|
||||
try:
|
||||
output = SysCommand(f'/usr/bin/findmnt --json -R {mountpoint}')
|
||||
output = SysCommand(f"/usr/bin/findmnt --json -R {mountpoint}").decode('UTF-8')
|
||||
except SysCallError:
|
||||
return []
|
||||
|
||||
mounts = []
|
||||
|
||||
output = output.decode('UTF-8')
|
||||
|
||||
if not output:
|
||||
return []
|
||||
|
||||
|
|
@ -749,16 +738,14 @@ def get_partitions_in_use(mountpoint) -> list:
|
|||
|
||||
def get_filesystem_type(path):
|
||||
try:
|
||||
handle = SysCommand(f"blkid -o value -s TYPE {path}")
|
||||
return b''.join(handle).strip().decode('UTF-8')
|
||||
return SysCommand(f"blkid -o value -s TYPE {path}").decode('UTF-8').strip()
|
||||
except SysCallError:
|
||||
return None
|
||||
|
||||
|
||||
def disk_layouts():
|
||||
try:
|
||||
handle = SysCommand("lsblk -f -o+TYPE,SIZE -J")
|
||||
return json.loads(b''.join(handle).decode('UTF-8'))
|
||||
return json.loads(SysCommand("lsblk -f -o+TYPE,SIZE -J").decode('UTF-8'))
|
||||
except SysCallError as err:
|
||||
log(f"Could not return disk layouts: {err}")
|
||||
return None
|
||||
|
|
|
|||
|
|
@ -75,15 +75,14 @@ def ask_user_questions():
|
|||
if archinstall.arguments.get('harddrives', None):
|
||||
archinstall.arguments['harddrives'] = [archinstall.BlockDevice(BlockDev) for BlockDev in archinstall.arguments['harddrives']]
|
||||
else:
|
||||
archinstall.arguments['harddrives'] = [
|
||||
archinstall.BlockDevice(BlockDev) for BlockDev in archinstall.generic_multi_select(archinstall.all_disks(),
|
||||
text="Select one or more harddrives to use and configure (leave blank to skip this step): ",
|
||||
allow_empty=True)
|
||||
]
|
||||
archinstall.arguments['harddrives'] = archinstall.generic_multi_select(archinstall.all_disks(),
|
||||
text="Select one or more harddrives to use and configure (leave blank to skip this step): ",
|
||||
allow_empty=True)
|
||||
|
||||
if archinstall.arguments.get('harddrives', None):
|
||||
archinstall.storage['disk_layouts'] = archinstall.select_disk_layout(archinstall.arguments['harddrives'])
|
||||
|
||||
exit(0)
|
||||
|
||||
# Get disk encryption password (or skip if blank)
|
||||
if archinstall.arguments['harddrives'] and archinstall.arguments.get('!encryption-password', None) is None:
|
||||
|
|
|
|||
Loading…
Reference in New Issue