index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2021-11-23 11:37:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-23 11:37:51 +0000 |
commit | 6b6c9c84bed1e4640f5f46282da1767827f977a9 (patch) | |
tree | 9a6750bd296e18cb36189ea06808524c1619d4e8 /archinstall/lib/disk/blockdevice.py | |
parent | e15697119116487f84e72a22e99f8e46d714f21f (diff) |
-rw-r--r-- | archinstall/lib/disk/blockdevice.py | 8 |
diff --git a/archinstall/lib/disk/blockdevice.py b/archinstall/lib/disk/blockdevice.py index b3195784..c4802a5f 100644 --- a/archinstall/lib/disk/blockdevice.py +++ b/archinstall/lib/disk/blockdevice.py @@ -2,13 +2,12 @@ import os import json import logging import time +from .helpers import convert_size_to_gb from ..exceptions import DiskError from ..output import log from ..general import SysCommand from ..storage import storage -GIGA = 2 ** 30 - class BlockDevice: def __init__(self, path, info=None): if not info: @@ -155,15 +154,12 @@ class BlockDevice: for partition in json.loads(SysCommand(f'lsblk -J -o+UUID {self.path}').decode('UTF-8'))['blockdevices']: return partition.get('uuid', None) - def convert_size_to_gb(self, size): - return round(size / GIGA,1) - @property def size(self): output = json.loads(SysCommand(f"lsblk --json -b -o+SIZE {self.path}").decode('UTF-8')) for device in output['blockdevices']: - return self.convert_size_to_gb(device['size']) + return convert_size_to_gb(device['size']) @property def bus_type(self): |