From ddbf978772b2db04734e030c9e0e91104bb21f15 Mon Sep 17 00:00:00 2001 From: Tau Date: Thu, 13 Feb 2025 22:53:35 +0100 Subject: [PATCH] fix init partition being too small to contain all necessary data --- vanilla_installer/defaults/disk.py | 2 +- vanilla_installer/utils/processor.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vanilla_installer/defaults/disk.py b/vanilla_installer/defaults/disk.py index dec94bc6..69e503c5 100644 --- a/vanilla_installer/defaults/disk.py +++ b/vanilla_installer/defaults/disk.py @@ -192,7 +192,7 @@ class PartitionSelector(Adw.PreferencesPage): }, "root_part_expand": { "mountpoint": "/", - "min_size": 22_011_707_392, # 20.5 GB + "min_size": 22_523_707_392, # 20.5 GB "partition": None, "fstype": None, }, diff --git a/vanilla_installer/utils/processor.py b/vanilla_installer/utils/processor.py index 45b07791..12232994 100644 --- a/vanilla_installer/utils/processor.py +++ b/vanilla_installer/utils/processor.py @@ -234,8 +234,8 @@ def __gen_auto_partition_steps( setup_steps.append([disk, "setflag", ["2", "esp", True]]) # LVM PVs - setup_steps.append([disk, "mkpart", ["vos-root", "none", 1537, 23656]]) - setup_steps.append([disk, "mkpart", ["vos-var", "none", 23656, -1]]) + setup_steps.append([disk, "mkpart", ["vos-root", "none", 1537, 24168]]) + setup_steps.append([disk, "mkpart", ["vos-var", "none", 24168, -1]]) part_prefix = f"{disk}p" if re.match(r"[0-9]", disk[-1]) else f"{disk}" setup_steps.append([disk, "pvcreate", [part_prefix + "3"]]) setup_steps.append([disk, "pvcreate", [part_prefix + "4"]]) @@ -245,7 +245,7 @@ def __gen_auto_partition_steps( setup_steps.append([disk, "vgcreate", ["vos-var", [part_prefix + "4"]]]) # Init files LV - setup_steps.append([disk, "lvcreate", ["init", "vos-root", "linear", 512]]) + setup_steps.append([disk, "lvcreate", ["init", "vos-root", "linear", 1024]]) setup_steps.append([disk, "lvm-format", ["vos-root/init", "ext4", "vos-init"]]) # LVM root thin pool @@ -353,7 +353,7 @@ def setup_partition( setup_steps.append([part_disk, "pvcreate", [part]]) setup_steps.append([part_disk, "vgcreate", ["vos-root", [part]]]) setup_steps.append( - [part_disk, "lvcreate", ["init", "vos-root", "linear", 512]] + [part_disk, "lvcreate", ["init", "vos-root", "linear", 1024]] ) setup_steps.append( [part_disk, "lvm-format", ["vos-root/init", "ext4", "vos-init"]] @@ -361,11 +361,11 @@ def setup_partition( # LVM root thin pool # Total pool size is the disk size, subtracted by: - # - 512 MiB from the init LV + # - 1024 MiB from the init LV # - 1024 MiB from the metadata LV # - 1028 MiB from LVM's internals (4 MiB header and 1024 MiB for thin) # - 100 MiB to account for various alignment issues - thin_size = (values["size"] / 1_048_576) - 1024 - 512 - 1028 - 100 + thin_size = (values["size"] / 1_048_576) - 1024 - 1024 - 1028 - 100 setup_steps.append( [part_disk, "lvcreate", ["root-meta", "vos-root", "linear", 1024]] )