parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 05:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

image.py: fix image corruption with partprobe

Browse source 
Partition mappings are initially created with the wrong sectorsize
for whatever reason..
This commit is contained in:
InsanePrawn 2022-02-06 23:40:00 +01:00
parent dd1423cfc9
commit c9cd26be61
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flash.py
View file

@ -8,7 +8,7 @@ import tempfile
from constants import FLASH_PARTS, LOCATIONS
from chroot import get_device_chroot
from fastboot import fastboot_flash
from image import shrink_fs, losetup_rootfs_image, dump_aboot, dump_lk2nd, dump_qhypstub, get_device_and_flavour, get_image_name, get_image_path
from image import partprobe, shrink_fs, losetup_rootfs_image, dump_aboot, dump_lk2nd, dump_qhypstub, get_device_and_flavour, get_image_name, get_image_path
from wrapper import enforce_wrap
ABOOT = FLASH_PARTS['ABOOT']
@ -70,6 +70,7 @@ def cmd_flash(what, location):
shutil.copyfile(device_image_path, minimal_image_path)
loop_device = losetup_rootfs_image(minimal_image_path, sector_size)
partprobe(loop_device)
shrink_fs(loop_device, minimal_image_path, sector_size)
result = subprocess.run([

12
image.py
View file

@ -18,6 +18,10 @@ from ssh import copy_ssh_keys
from wrapper import enforce_wrap
def partprobe(device: str):
return subprocess.run(['partprobe', device])
def shrink_fs(loop_device: str, file: str, sector_size: int):
# 8: 512 bytes sectors
# 1: 4096 bytes sectors
@ -66,6 +70,8 @@ def shrink_fs(loop_device: str, file: str, sector_size: int):
if returncode > 1:
raise Exception(f'Failed to shrink partition size of {loop_device}p2 with fdisk')
partprobe(loop_device)
logging.debug(f'Finding end sector of partition at {loop_device}p2')
result = subprocess.run(['fdisk', '-b', str(sector_size), '-l', loop_device], capture_output=True)
if result.returncode != 0:
@ -88,6 +94,7 @@ def shrink_fs(loop_device: str, file: str, sector_size: int):
result = subprocess.run(['truncate', '-o', '-s', str(end_block), file])
if result.returncode != 0:
raise Exception(f'Failed to truncate {file}')
partprobe(loop_device)
def get_device_and_flavour(profile: str = None) -> tuple[str, str]:
@ -142,6 +149,7 @@ def losetup_rootfs_image(image_path: str, sector_size: int) -> str:
if loop_device == '':
raise Exception(f'Failed to find loop device for {image_path}')
partprobe(loop_device)
def losetup_destroy():
logging.debug(f'Destroying loop device {loop_device} for {image_path}')
@ -278,7 +286,7 @@ def cmd_build(profile_name: str = None, build_pkgs: bool = True):
] + create_partition_table + create_boot_partition + create_root_partition + enable_boot)
if result.returncode != 0:
raise Exception(f'Failed to create partitions on {loop_device}')
partprobe(loop_device)
result = subprocess.run([
'mkfs.ext2',
'-F',
@ -348,7 +356,7 @@ def cmd_inspect(shell: bool = False):
chroot = get_device_chroot(device, flavour, arch)
image_path = get_image_path(chroot)
loop_device = losetup_rootfs_image(image_path, sector_size)
partprobe(loop_device)
mount_chroot(loop_device + 'p2', loop_device + 'p1', chroot)
logging.info(f'Inspect the rootfs image at {chroot.path}')