parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

Chroot.mount(): don't purely rely on ismount(), also check self.active_mounts as we should.

Browse source
This commit is contained in:
InsanePrawn 2021-12-20 04:21:09 +01:00
parent e3f49042ff
commit 844646baca
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
chroot.py
View file

@ -278,7 +278,8 @@ class Chroot:
"""returns the absolute path `relative_target` was mounted at""" """returns the absolute path `relative_target` was mounted at"""
relative_destination = relative_destination.lstrip('/') relative_destination = relative_destination.lstrip('/')
absolute_destination = self.get_path(relative_destination) absolute_destination = self.get_path(relative_destination)
if os.path.ismount(absolute_destination): pseudo_absolute = make_abs_path(relative_destination)
if os.path.ismount(absolute_destination) or pseudo_absolute in self.active_mounts:
if fail_if_mounted: if fail_if_mounted:
raise Exception(f'{self.name}: {absolute_destination} is already mounted') raise Exception(f'{self.name}: {absolute_destination} is already mounted')
logging.debug(f'{self.name}: {absolute_destination} already mounted. Skipping.') logging.debug(f'{self.name}: {absolute_destination} already mounted. Skipping.')
@ -289,7 +290,7 @@ class Chroot:
if result.returncode != 0: if result.returncode != 0:
raise Exception(f'{self.name}: failed to mount {absolute_source} to {absolute_destination}') raise Exception(f'{self.name}: failed to mount {absolute_source} to {absolute_destination}')
logging.debug(f'{self.name}: {absolute_source} successfully mounted to {absolute_destination}.') logging.debug(f'{self.name}: {absolute_source} successfully mounted to {absolute_destination}.')
self.active_mounts += [make_abs_path(relative_destination)] self.active_mounts += [pseudo_absolute]
atexit.register(self.deactivate) atexit.register(self.deactivate)
return absolute_destination return absolute_destination