image.py: specify blocksize when creating filesystems (mke2fs -b)

This commit is contained in:
InsanePrawn 2022-02-07 01:20:38 +01:00
parent 52933e6377
commit fc58f4288f

View file

@ -268,7 +268,7 @@ def partition_device(device: str):
raise Exception(f'Failed to create partitions on {device}') raise Exception(f'Failed to create partitions on {device}')
def create_root_fs(device: str): def create_root_fs(device: str, blocksize: int):
result = subprocess.run([ result = subprocess.run([
'mkfs.ext4', 'mkfs.ext4',
'-O', '-O',
@ -278,18 +278,22 @@ def create_root_fs(device: str):
'kupfer_root', 'kupfer_root',
'-N', '-N',
'100000', '100000',
'-b',
str(blocksize),
device, device,
]) ])
if result.returncode != 0: if result.returncode != 0:
raise Exception(f'Failed to create ext4 filesystem on {device}') raise Exception(f'Failed to create ext4 filesystem on {device}')
def create_boot_fs(device: str): def create_boot_fs(device: str, blocksize: int):
result = subprocess.run([ result = subprocess.run([
'mkfs.ext2', 'mkfs.ext2',
'-F', '-F',
'-L', '-L',
'kupfer_boot', 'kupfer_boot',
'-b',
str(blocksize),
device, device,
]) ])
if result.returncode != 0: if result.returncode != 0:
@ -389,8 +393,8 @@ def cmd_build(profile_name: str = None, build_pkgs: bool = True, block_target: s
boot_dev = create_img_file(get_image_path(device, flavour, 'boot'), IMG_FILE_BOOT_DEFAULT_SIZE) boot_dev = create_img_file(get_image_path(device, flavour, 'boot'), IMG_FILE_BOOT_DEFAULT_SIZE)
root_dev = create_img_file(get_image_path(device, flavour, 'root'), f'{rootfs_size_gb * 1000 - 200}M') root_dev = create_img_file(get_image_path(device, flavour, 'root'), f'{rootfs_size_gb * 1000 - 200}M')
create_boot_fs(boot_dev) create_boot_fs(boot_dev, sector_size)
create_root_fs(root_dev) create_root_fs(root_dev, sector_size)
install_rootfs( install_rootfs(
root_dev, root_dev,