install: tweak flash information output (MR 1991)
This adds generic advice when no flashing method is configured and remove deprecated angle brackets. Closes: #1948
This commit is contained in:
parent
ed2175546c
commit
751524b5b4
|
@ -518,8 +518,6 @@ def print_flash_info(args):
|
||||||
""" Print flashing information, based on the deviceinfo data and the
|
""" Print flashing information, based on the deviceinfo data and the
|
||||||
pmbootstrap arguments. """
|
pmbootstrap arguments. """
|
||||||
logging.info("*** FLASHING INFORMATION ***")
|
logging.info("*** FLASHING INFORMATION ***")
|
||||||
logging.info("Run the following to flash your installation to the"
|
|
||||||
" target device:")
|
|
||||||
|
|
||||||
# System flash information
|
# System flash information
|
||||||
method = args.deviceinfo["flash_method"]
|
method = args.deviceinfo["flash_method"]
|
||||||
|
@ -527,6 +525,16 @@ def print_flash_info(args):
|
||||||
flasher_actions = flasher.get("actions", {})
|
flasher_actions = flasher.get("actions", {})
|
||||||
requires_split = flasher.get("split", False)
|
requires_split = flasher.get("split", False)
|
||||||
|
|
||||||
|
if method == "none":
|
||||||
|
logging.info("Refer to the installation instructions of your device,"
|
||||||
|
" or the generic install instructions in the wiki.")
|
||||||
|
logging.info("https://wiki.postmarketos.org/wiki/Installation_guide"
|
||||||
|
"#pmbootstrap_flash")
|
||||||
|
return
|
||||||
|
|
||||||
|
logging.info("Run the following to flash your installation to the"
|
||||||
|
" target device:")
|
||||||
|
|
||||||
if "flash_rootfs" in flasher_actions and not args.sdcard and \
|
if "flash_rootfs" in flasher_actions and not args.sdcard and \
|
||||||
bool(args.split) == requires_split:
|
bool(args.split) == requires_split:
|
||||||
logging.info("* pmbootstrap flasher flash_rootfs")
|
logging.info("* pmbootstrap flasher flash_rootfs")
|
||||||
|
@ -584,7 +592,7 @@ def install_recovery_zip(args, steps):
|
||||||
# Flash information
|
# Flash information
|
||||||
logging.info("*** FLASHING INFORMATION ***")
|
logging.info("*** FLASHING INFORMATION ***")
|
||||||
logging.info("Flashing with the recovery zip is explained here:")
|
logging.info("Flashing with the recovery zip is explained here:")
|
||||||
logging.info("<https://postmarketos.org/recoveryzip>")
|
logging.info("https://postmarketos.org/recoveryzip")
|
||||||
|
|
||||||
|
|
||||||
def install_on_device_installer(args, step, steps):
|
def install_on_device_installer(args, step, steps):
|
||||||
|
|
Loading…
Reference in New Issue