Merge pull request #134 from postmarketOS/fix-missing-flavor-variable
Added flavor to the flash_system command for consistency
This commit is contained in:
commit
9d9dc9e541
|
@ -20,7 +20,7 @@ import pmb.flasher
|
||||||
import pmb.chroot.initfs
|
import pmb.chroot.initfs
|
||||||
|
|
||||||
|
|
||||||
def run(args, action, flavor):
|
def run(args, action, flavor=None):
|
||||||
pmb.flasher.init(args)
|
pmb.flasher.init(args)
|
||||||
|
|
||||||
# Verify action
|
# Verify action
|
||||||
|
@ -39,7 +39,7 @@ def run(args, action, flavor):
|
||||||
# Variable setup
|
# Variable setup
|
||||||
vars = {
|
vars = {
|
||||||
"$BOOT": "/mnt/rootfs_" + args.device + "/boot",
|
"$BOOT": "/mnt/rootfs_" + args.device + "/boot",
|
||||||
"$FLAVOR": flavor,
|
"$FLAVOR": flavor if flavor is not None else "",
|
||||||
"$IMAGE": "/home/user/rootfs/" + args.device + ".img",
|
"$IMAGE": "/home/user/rootfs/" + args.device + ".img",
|
||||||
"$KERNEL_CMDLINE": cmdline,
|
"$KERNEL_CMDLINE": cmdline,
|
||||||
"$OFFSET_KERNEL": args.deviceinfo["flash_offset_kernel"],
|
"$OFFSET_KERNEL": args.deviceinfo["flash_offset_kernel"],
|
||||||
|
|
Loading…
Reference in New Issue