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

pmbootstrap install: support new ondev boot label (MR 2083) 

In order to support FAT32 as boot partition, the label is shortened from
pmOS_inst_boot to pmOS_i_boot. Read the value from pmaports.cfg and fall
back to the old value, so both are supported (-> building v21.06 and
v21.03 will use the old label).

Remove the old codepath that would set "pmOS_boot" as label for the
install partition, if the postmarketos-ondev package was older than
0.4.0. This is only the case on the long unsupported v20.05 branch.
This commit is contained in:
Oliver Smith 2021-07-11 18:17:21 +02:00
parent f62242aeb1
commit 68fe7df046
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pmb/install/_install.py
View File

@ -776,9 +776,9 @@ 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"
pmaports_cfg = pmb.config.pmaports.read_config(args)
boot_label = pmaports_cfg.get("supported_install_boot_label",
"pmOS_inst_boot")
install_system_image(args, size_reserve, suffix_installer, step, steps,
boot_label, "pmOS_install", args.split, args.sdcard)