diff --git a/.gitignore b/.gitignore index 401a67c..5263a53 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ __pycache__/ .coverage* *.xml *.egg-info +dist diff --git a/src/kupferbootstrap/chroot/device.py b/src/kupferbootstrap/chroot/device.py index f7a3fa5..56de30b 100644 --- a/src/kupferbootstrap/chroot/device.py +++ b/src/kupferbootstrap/chroot/device.py @@ -1,7 +1,7 @@ import atexit import os -from typing import ClassVar, Optional +from typing import ClassVar, Optional, cast from kupferbootstrap.config.state import config from kupferbootstrap.constants import Arch, BASE_PACKAGES @@ -20,15 +20,14 @@ class DeviceChroot(BuildChroot): _copy_base: ClassVar[bool] = False def create_rootfs(self, reset, pacman_conf_target, active_previously): - clss = BuildChroot if self.copy_base else BaseChroot - makedir(config.get_path('chroots')) root_makedir(self.get_path()) if not self.copy_base: pacman_conf_target = os.path.join(get_temp_dir(register_cleanup=True), f'pacman-{self.name}.conf') self.write_pacman_conf(in_chroot=False, absolute_path=pacman_conf_target) - - clss.create_rootfs(self, reset, pacman_conf_target, active_previously) + BaseChroot.create_rootfs(cast(BaseChroot, self), reset, pacman_conf_target, active_previously) + else: + BuildChroot.create_rootfs(self, reset, pacman_conf_target, active_previously) def mount_rootfs(self, source_path: str, fs_type: Optional[str] = None, options: list[str] = [], allow_overlay: bool = False): if self.active: