pmb.chroot.mount: Fix pmb chroot --image for single-partition rootfs

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/merge_requests/2641
This commit is contained in:
Anri Dellal 2025-07-07 17:45:31 +03:00 committed by Newbyte
parent 7b78bcfcf9
commit 77b2717d66
No known key found for this signature in database
GPG key ID: ACD854892B38D898

View file

@ -35,8 +35,11 @@ def mount_chroot_image(chroot: Chroot) -> None:
chroot.path.mkdir(exist_ok=True)
loopdev_basename = os.path.basename(loopdev)
# # The name of the IMAGE chroot is the path to the rootfs image
pmb.helpers.run.root(["mount", f"/dev/mapper/{loopdev_basename}p2", chroot.path])
pmb.helpers.run.root(["mount", f"/dev/mapper/{loopdev_basename}p1", chroot.path / "boot"])
if Path(f"/dev/mapper/{loopdev_basename}p2").exists():
pmb.helpers.run.root(["mount", f"/dev/mapper/{loopdev_basename}p2", chroot.path])
pmb.helpers.run.root(["mount", f"/dev/mapper/{loopdev_basename}p1", chroot.path / "boot"])
else:
pmb.helpers.run.root(["mount", f"/dev/{loopdev_basename}", chroot.path])
pmb.config.workdir.chroot_save_init(chroot)