josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

ldconfig.fakechroot: support DPKG_ROOT

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2021-09-23 06:07:48 +02:00
parent 12ec2c50aa
commit 932a3716bc
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ldconfig.fakechroot
View file

@ -90,6 +90,12 @@ def main():
chroot = Path(os.environ["FAKECHROOT_BASE_ORIG"]) chroot = Path(os.environ["FAKECHROOT_BASE_ORIG"])
# if chrootless mode is used from within a fakechroot chroot, then
# FAKECHROOT_BASE_ORIG will point at the outer chroot. We want to use
# the path from DPKG_ROOT inside of that instead
if os.environ.get("DPKG_ROOT", "") not in ["", "/"]:
chroot /= os.environ["DPKG_ROOT"].lstrip("/")
if not (chroot / "sbin" / "ldconfig").exists(): if not (chroot / "sbin" / "ldconfig").exists():
sys.exit(0) sys.exit(0)