parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-06-27 10:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

move pacman.conf body to generator.py, fix check_space for build chroots

Browse source 
with check_space=True, build chroots fail to pacman -S anything, because their rootfs is not a mountpoint,
hence pacman's space calculations will fail and return not enough free space.
We do want these space checks when pacstrapping device rootfilesystems though.
This commit is contained in:
InsanePrawn 2022-02-17 02:32:22 +01:00
parent 59747f7a14
commit 2ece1f288c
3 changed files with 84 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
chroot.py
View file

@ -243,10 +243,10 @@ class Chroot:
# base chroot
if reset:
logging.info(f'Resetting {self.name}')
for dir in glob(os.join(self.path, '*')):
for dir in glob(os.path.join(self.path, '*')):
rmtree(dir)
self.write_pacman_conf()
self.write_pacman_conf(check_space=True)
self.mount_pacman_cache()
logging.info(f'Pacstrapping chroot {self.name}: {", ".join(self.base_packages)}')
@ -539,9 +539,9 @@ class Chroot:
f.write(makepkg_cross_conf)
return makepkg_conf_path_relative
def write_pacman_conf(self):
def write_pacman_conf(self, check_space: bool = False):
os.makedirs(self.get_path('/etc'), exist_ok=True)
conf_text = get_base_distro(self.arch).get_pacman_conf(self.extra_repos)
conf_text = get_base_distro(self.arch).get_pacman_conf(self.extra_repos, check_space=check_space)
with open(self.get_path('etc/pacman.conf'), 'w') as file:
file.write(conf_text)