Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

chroot: allow mounting the device rootfs (MR 2252)

Browse source 
Add a new flag --image which can be used to mount the rootfs generated
with "pmbootstrap install".

For now this is quite limited in scope. But it's enough to allow for
building a package, updating it in the QEMU image, and then booting it.

The major "gotcha" with this is that the QEMU uses the kernel and
initramfs from the device chroot unless you run it with --efi.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-06-14 07:25:49 +02:00 • committed by Oliver Smith
parent d1a86fe702
commit f331b95824
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
8 changed files with 55 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pmb/helpers/frontend.py
View file

@ -63,11 +63,15 @@ def _parse_flavor(device: str, autoinstall=True):
def _parse_suffix(args: PmbArgs) -> Chroot:
deviceinfo = pmb.parse.deviceinfo()
if args.image:
rootfs = Chroot.native() / f"home/pmos/rootfs/{deviceinfo.codename}.img"
return Chroot(ChrootType.IMAGE, str(rootfs))
if "rootfs" in args and args.rootfs:
return Chroot(ChrootType.ROOTFS, get_context().config.device)
elif args.buildroot:
if args.buildroot == "device":
return Chroot.buildroot(pmb.parse.deviceinfo().arch)
return Chroot.buildroot(deviceinfo.arch)
else:
return Chroot.buildroot(Arch.from_str(args.buildroot))
elif args.suffix:
@ -168,12 +172,15 @@ def chroot(args: PmbArgs):
chroot = _parse_suffix(args)
user = args.user
if (user and chroot != Chroot.native() and
not chroot.type == ChrootType.BUILDROOT):
chroot.type not in [ChrootType.BUILDROOT, ChrootType.IMAGE]):
raise RuntimeError("--user is only supported for native or"
" buildroot_* chroots.")
if args.xauth and chroot != Chroot.native():
raise RuntimeError("--xauth is only supported for native chroot.")
if chroot.type == ChrootType.IMAGE:
pmb.chroot.mount(chroot)
# apk: check minimum version, install packages
pmb.chroot.apk.check_min_version(chroot)
if args.add: