From 3c9b96f03f570c17405f55f8a1059287b8aef587 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Mon, 12 Jun 2023 01:10:54 +0200 Subject: [PATCH] image: rename `aboot` to `abootimg` and `rootfs` to `full` --- constants.py | 4 ++-- image/flash.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/constants.py b/constants.py index d881b9f..723dcc0 100644 --- a/constants.py +++ b/constants.py @@ -2,8 +2,8 @@ from typehelpers import TypeAlias FASTBOOT = 'fastboot' FLASH_PARTS = { - 'ROOTFS': 'rootfs', - 'ABOOT': 'aboot', + 'FULL': 'full', + 'ABOOT': 'abootimg', 'LK2ND': 'lk2nd', 'QHYPSTUB': 'qhypstub', } diff --git a/image/flash.py b/image/flash.py index 876900a..5def17c 100644 --- a/image/flash.py +++ b/image/flash.py @@ -19,7 +19,7 @@ from .image import dd_image, dump_aboot, dump_lk2nd, dump_qhypstub, get_image_pa ABOOT = FLASH_PARTS['ABOOT'] LK2ND = FLASH_PARTS['LK2ND'] QHYPSTUB = FLASH_PARTS['QHYPSTUB'] -ROOTFS = FLASH_PARTS['ROOTFS'] +FULL_IMG = FLASH_PARTS['FULL'] DD = 'dd' @@ -82,7 +82,7 @@ def cmd_flash( """ Flash a partition onto a device. - The syntax of LOCATION depends on the flashing method and is usually only required for flashing "rootfs": + The syntax of LOCATION depends on the flashing method and is usually only required for flashing "full": \b - fastboot: the regular fastboot partition identifier. Usually "userdata" @@ -108,7 +108,7 @@ def cmd_flash( "This will brick your phone and is not what you want.\n" 'Aborting.\nDid you mean to flash to "boot"?') - if what == ROOTFS: + if what == FULL_IMG: path = '' if method not in FLASH_METHODS: raise Exception(f"Flash method {method} not supported!")