pmb/install/recovery: add support for single kernel 'flavor' (MR 2093)
This commit is contained in:
parent
05c9fb784f
commit
91bb682755
|
@ -3,6 +3,7 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import pmb.chroot
|
import pmb.chroot
|
||||||
|
import pmb.config.pmaports
|
||||||
import pmb.flasher
|
import pmb.flasher
|
||||||
import pmb.helpers.frontend
|
import pmb.helpers.frontend
|
||||||
|
|
||||||
|
@ -30,7 +31,6 @@ def create_zip(args, suffix):
|
||||||
# Create config file for the recovery installer
|
# Create config file for the recovery installer
|
||||||
options = {
|
options = {
|
||||||
"DEVICE": args.device,
|
"DEVICE": args.device,
|
||||||
"FLAVOR": flavor,
|
|
||||||
"FLASH_KERNEL": args.recovery_flash_kernel,
|
"FLASH_KERNEL": args.recovery_flash_kernel,
|
||||||
"ISOREC": method == "heimdall-isorec",
|
"ISOREC": method == "heimdall-isorec",
|
||||||
"KERNEL_PARTLABEL": vars["$PARTITION_KERNEL"],
|
"KERNEL_PARTLABEL": vars["$PARTITION_KERNEL"],
|
||||||
|
@ -41,6 +41,13 @@ def create_zip(args, suffix):
|
||||||
"FDE": args.full_disk_encryption,
|
"FDE": args.full_disk_encryption,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Backwards compatibility with old mkinitfs (pma#660)
|
||||||
|
pmaports_cfg = pmb.config.pmaports.read_config(args)
|
||||||
|
if pmaports_cfg.get("supported_mkinitfs_without_flavors", False):
|
||||||
|
options["FLAVOR"] = ""
|
||||||
|
else:
|
||||||
|
options["FLAVOR"] = f"-{flavor}" if flavor is not None else "-"
|
||||||
|
|
||||||
# Write to a temporary file
|
# Write to a temporary file
|
||||||
config_temp = args.work + "/chroot_" + suffix + "/tmp/install_options"
|
config_temp = args.work + "/chroot_" + suffix + "/tmp/install_options"
|
||||||
with open(config_temp, "w") as handle:
|
with open(config_temp, "w") as handle:
|
||||||
|
|
Loading…
Reference in New Issue