diff --git a/chroot/base.py b/chroot/base.py index 0bf10e8..d5ba961 100644 --- a/chroot/base.py +++ b/chroot/base.py @@ -1,11 +1,11 @@ import logging import os -import subprocess from glob import glob from shutil import rmtree from constants import Arch +from exec import run_root_cmd from .abstract import Chroot, get_chroot from .helpers import base_chroot_name @@ -26,7 +26,7 @@ class BaseChroot(Chroot): logging.info(f'Pacstrapping chroot {self.name}: {", ".join(self.base_packages)}') - result = subprocess.run([ + result = run_root_cmd([ 'pacstrap', '-C', pacman_conf_target, diff --git a/chroot/build.py b/chroot/build.py index 21f3b9f..261cf14 100644 --- a/chroot/build.py +++ b/chroot/build.py @@ -7,6 +7,7 @@ from typing import Optional from config import config from constants import Arch, GCC_HOSTSPECS, CROSSDIRECT_PKGS, CHROOT_PATHS from distro.distro import get_kupfer_local +from exec import run_root_cmd from .abstract import Chroot, get_chroot from .helpers import build_chroot_name @@ -29,7 +30,7 @@ class BuildChroot(Chroot): cmd += ['--exclude', mountpoint.rstrip('/')] cmd += [f'{base_chroot.path}/', f'{self.path}/'] logging.debug(f"running rsync: {cmd}") - result = subprocess.run(cmd) + result = run_root_cmd(cmd) if result.returncode != 0: raise Exception(f'Failed to copy {base_chroot.name} to {self.name}')