synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install --ondev: set boot label: pmOS_inst_boot (MR 2008) 

With postmarketos-ondev >= 0.4.0, have a different label for the boot
partition in the installer OS, so the postmarketOS initramfs can find
the proper partition to boot. Even if the boot partition is available
twice (once installed on eMMC, once as part of installer OS on SD card).

pmOS_inst_boot instead of pmOS_install_boot because of character limit.
This commit is contained in:
Oliver Smith 2020-12-18 22:18:42 +01:00 committed by Martijn Braam
parent 34f5a12c21
commit d9682be771
No known key found for this signature in database
GPG Key ID: C4280ACB000B060F
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pmb/config/__init__.py
View File

@ -32,7 +32,10 @@ pmaports_min_version = "7"
# see migrate_work_folder()).
work_version = 5
# Minimum required version of postmarketos-ondev (pmbootstrap install --ondev)
# Minimum required version of postmarketos-ondev (pmbootstrap install --ondev).
# Try to support the current versions of all channels (edge, stable). When
# bumping > 0.4.0, remove compat code in pmb/install/_install.py (search for
# get_ondev_pkgver).
ondev_min_version = "0.2.0"
# Programs that pmbootstrap expects to be available from the host system. Keep

5
pmb/install/_install.py
View File

@ -645,8 +645,11 @@ def install_on_device_installer(args, step, steps):
# Generate installer image
size_reserve = round(os.path.getsize(img_path_dest) / 1024 / 1024) + 200
boot_label = "pmOS_inst_boot"
if pmb.parse.version.compare(get_ondev_pkgver(args), "0.4.0") == -1:
boot_label = "pmOS_boot"
install_system_image(args, size_reserve, suffix_installer, step, steps,
"pmOS_install", args.split, args.sdcard)
boot_label, "pmOS_install", args.split, args.sdcard)
def create_device_rootfs(args, step, steps):