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: cleanups, run umount as root

Browse source
This commit is contained in:
InsanePrawn 2022-08-16 02:31:11 +02:00
parent dbf65b44df
commit dd7e1716b8
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
image.py
View file

@ -6,7 +6,7 @@ import subprocess
import click
import logging
from signal import pause
from subprocess import run, CompletedProcess
from subprocess import CompletedProcess
from typing import Optional
from chroot.device import DeviceChroot, get_device_chroot
@ -210,8 +210,7 @@ def dump_aboot(image_path: str) -> str:
f'dump /aboot.img {path}',
])
if result.returncode != 0:
logging.fatal('Failed to dump aboot.img')
exit(1)
raise Exception('Failed to dump aboot.img')
return path
@ -227,8 +226,7 @@ def dump_lk2nd(image_path: str) -> str:
f'dump /lk2nd.img {path}',
])
if result.returncode != 0:
logging.fatal('Failed to dump lk2nd.img')
exit(1)
raise Exception('Failed to dump lk2nd.img')
return path
@ -241,8 +239,7 @@ def dump_qhypstub(image_path: str) -> str:
f'dump /qhypstub.bin {path}',
])
if result.returncode != 0:
logging.fatal('Failed to dump qhypstub.bin')
exit(1)
raise Exception('Failed to dump qhypstub.bin')
return path
@ -346,7 +343,8 @@ def install_rootfs(
chroot.deactivate()
logging.debug(f'Unmounting rootfs at "{chroot.path}"')
res = run(['umount', chroot.path])
res = run_root_cmd(['umount', chroot.path])
assert isinstance(res, CompletedProcess)
logging.debug(f'rc: {res.returncode}')