feat: enforce 128 GB minimum, skip data disk for Desktop Only role
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/2be6c138-feda-4c5d-9bd8-0e5f2f6416bc Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
265f34b8aa
commit
9664c59523
@@ -501,8 +501,17 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
self.boot_disk, self.boot_size = disks[0]
|
self.boot_disk, self.boot_size = disks[0]
|
||||||
self.data_disk, self.data_size = None, None
|
self.data_disk, self.data_size = None, None
|
||||||
|
|
||||||
|
BYTES_128GB = 128 * 1024 ** 3
|
||||||
|
if self.role == "Desktop Only" and self.boot_size < BYTES_128GB:
|
||||||
|
self.show_error(
|
||||||
|
f"Boot disk /dev/{self.boot_disk} is only "
|
||||||
|
f"{human_size(self.boot_size)}. "
|
||||||
|
f"The Desktop Only role requires at least 128 GB."
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
BYTES_2TB = 2 * 1024 ** 4
|
BYTES_2TB = 2 * 1024 ** 4
|
||||||
if len(disks) >= 2:
|
if self.role != "Desktop Only" and len(disks) >= 2:
|
||||||
d, s = disks[-1]
|
d, s = disks[-1]
|
||||||
if s >= BYTES_2TB:
|
if s >= BYTES_2TB:
|
||||||
self.data_disk, self.data_size = d, s
|
self.data_disk, self.data_size = d, s
|
||||||
@@ -528,7 +537,7 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
data_row.set_subtitle(f"/dev/{self.data_disk} — {human_size(self.data_size)}")
|
data_row.set_subtitle(f"/dev/{self.data_disk} — {human_size(self.data_size)}")
|
||||||
data_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
|
data_row.add_prefix(symbolic_icon("drive-harddisk-symbolic"))
|
||||||
disk_group.add(data_row)
|
disk_group.add(data_row)
|
||||||
else:
|
elif self.role != "Desktop Only":
|
||||||
no_row = Adw.ActionRow()
|
no_row = Adw.ActionRow()
|
||||||
no_row.set_title("Data Disk")
|
no_row.set_title("Data Disk")
|
||||||
no_row.set_subtitle("None detected (requires 2 TB or larger)")
|
no_row.set_subtitle("None detected (requires 2 TB or larger)")
|
||||||
|
|||||||
Reference in New Issue
Block a user