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: dump_file_from_image(): try to detect debugfs failure

Browse source 
Try to detect missing file after supposedly dumping it since debugfs doesn't always error out correctly
This commit is contained in:
InsanePrawn 2023-04-30 04:05:59 +02:00
parent edcad72f7a
commit de76641fa1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
image/image.py
View file

@ -15,7 +15,7 @@ from constants import Arch, BASE_LOCAL_PACKAGES, BASE_PACKAGES, POST_INSTALL_CMD
from distro.distro import get_base_distro, get_kupfer_https from distro.distro import get_base_distro, get_kupfer_https
from devices.device import Device, get_profile_device from devices.device import Device, get_profile_device
from exec.cmd import run_root_cmd, generate_cmd_su from exec.cmd import run_root_cmd, generate_cmd_su
from exec.file import root_write_file, root_makedir, makedir from exec.file import get_temp_dir, root_write_file, root_makedir, makedir
from flavours.flavour import Flavour, get_profile_flavour from flavours.flavour import Flavour, get_profile_flavour
from net.ssh import copy_ssh_keys from net.ssh import copy_ssh_keys
from packages.build import build_enable_qemu_binfmt, build_packages, filter_pkgbuilds from packages.build import build_enable_qemu_binfmt, build_packages, filter_pkgbuilds
@ -220,14 +220,14 @@ def mount_chroot(rootfs_source: str, boot_src: str, chroot: DeviceChroot):
def dump_file_from_image(image_path: str, file_path: str, target_path: Optional[str] = None): def dump_file_from_image(image_path: str, file_path: str, target_path: Optional[str] = None):
target_path = target_path or os.path.join('/tmp', os.path.basename(file_path)) target_path = target_path or os.path.join(get_temp_dir(), os.path.basename(file_path))
result = run_root_cmd([ result = run_root_cmd([
'debugfs', 'debugfs',
image_path, image_path,
'-R', '-R',
f'\'dump /{file_path.lstrip("/")} {target_path}\'', f'\'dump /{file_path.lstrip("/")} {target_path}\'',
]) ])
if result.returncode != 0: if result.returncode != 0 or not os.path.exists(target_path):
raise Exception(f'Failed to dump {file_path} from /boot') raise Exception(f'Failed to dump {file_path} from /boot')
return target_path return target_path