Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk/blockdevice.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-11-23 11:37:51 +0000
committerGitHub <noreply@github.com>2021-11-23 11:37:51 +0000
commit6b6c9c84bed1e4640f5f46282da1767827f977a9 (patch)
tree9a6750bd296e18cb36189ea06808524c1619d4e8 /archinstall/lib/disk/blockdevice.py
parente15697119116487f84e72a22e99f8e46d714f21f (diff)
Adding a warning when /boot is reasonably too small (#738)
* Moved convert_size_to_gb() into disk/helpers.py, Added a Partition().size property meta function. Using the .size value to check if /boot is too small which will raise an exception. The only drawback is that it's done post-formatting. This in order to catch scenarios where formatting isn't used. * Changed /boot warning from 0.15GB to 0.25GB * Changed the wording in the warning when /boot is too small.
Diffstat (limited to 'archinstall/lib/disk/blockdevice.py')
-rw-r--r--archinstall/lib/disk/blockdevice.py8
1 files changed, 2 insertions, 6 deletions
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):