diff options
Diffstat (limited to 'scripts/image_signing/make_dev_firmware.sh')
| -rwxr-xr-x | scripts/image_signing/make_dev_firmware.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/image_signing/make_dev_firmware.sh b/scripts/image_signing/make_dev_firmware.sh index 7d9fa414..caf45e4e 100755 --- a/scripts/image_signing/make_dev_firmware.sh +++ b/scripts/image_signing/make_dev_firmware.sh @@ -147,15 +147,15 @@ main() { debug_msg "Checking software write protection status" disable_write_protection || if is_debug_mode; then - err_die "Failed to disable WP. Diagnose Message: $(cat "$EXEC_LOG")" + die "Failed to disable WP. Diagnose Message: $(cat "${EXEC_LOG}")" else - err_die "Write protection is still enabled. " \ - "Please verify that hardware write protection is disabled." + die "Write protection is still enabled. " \ + "Please verify that hardware write protection is disabled." fi debug_msg "Pulling image to $IMAGE" (read_image && [ -s "$IMAGE" ]) || - err_die "Failed to read image. Error message: $(cat "$EXEC_LOG")" + die "Failed to read image. Error message: $(cat "${EXEC_LOG}")" debug_msg "Prepare to backup the file" if [ -n "$is_from_live" -o $FLAGS_force_backup = $FLAGS_TRUE ]; then @@ -168,7 +168,7 @@ main() { local expanded_firmware_dir="$(make_temp_dir)" local use_devfw_keyblock="$FLAGS_FALSE" (cd "$expanded_firmware_dir"; dump_fmap -x "$IMAGE" >/dev/null 2>&1) || - err_die "Failed to extract firmware image." + die "Failed to extract firmware image." if [ -f "$expanded_firmware_dir/VBLOCK_A" ]; then local has_dev=$FLAGS_TRUE has_norm=$FLAGS_TRUE # In output of vbutil_keyblock, "!DEV" means "bootable on normal mode" and @@ -211,7 +211,7 @@ main() { --verify "$expanded_firmware_dir/VBLOCK_A" \ --signpubkey "$expanded_firmware_dir/rootkey" \ --fv "$expanded_firmware_dir/FW_MAIN_A")" 2>/dev/null || - err_die "Failed to verify firmware slot A." + die "Failed to verify firmware slot A." data_key_version="$( echo "$fw_info" | sed -n '/^ *Data key version:/s/.*:[ \t]*//p')" firmware_version="$( @@ -262,7 +262,7 @@ main() { "$kernel_sub_pubkey" \ "$firmware_version" \ $optional_opts >"$EXEC_LOG" 2>&1 || - err_die "Failed to re-sign firmware. (message: $(cat "$EXEC_LOG"))" + die "Failed to re-sign firmware. (message: $(cat "${EXEC_LOG}"))" if is_debug_mode; then cat "$EXEC_LOG" fi @@ -274,7 +274,7 @@ main() { debug_msg "Decide new HWID" [ -z "$old_hwid" ] && - err_die "Cannot find current HWID. (message: $(cat "$EXEC_LOG"))" + die "Cannot find current HWID. (message: $(cat "${EXEC_LOG}"))" local new_hwid="$old_hwid" if [ "$FLAGS_mod_hwid" = "$FLAGS_TRUE" ]; then new_hwid="$(echo_dev_hwid "$old_hwid")" @@ -285,7 +285,7 @@ main() { sed -rne 's/^flags: (.*)$/\1/p')" debug_msg "Decide new GBB flags from: $old_gbb_flags" [ -z "$old_gbb_flags" ] && - err_die "Cannot find GBB flags. (message: $(cat "$EXEC_LOG"))" + die "Cannot find GBB flags. (message: $(cat "${EXEC_LOG}"))" # 0x30: GBB_FLAG_FORCE_DEV_BOOT_USB | GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK local new_gbb_flags="$((old_gbb_flags | 0x30))" @@ -295,7 +295,7 @@ main() { --rootkey="$root_pubkey" \ --recoverykey="$recovery_pubkey" \ "$IMAGE" >"$EXEC_LOG" 2>&1 || - err_die "Failed to change GBB Data. (message: $(cat "$EXEC_LOG"))" + die "Failed to change GBB Data. (message: $(cat "${EXEC_LOG}"))" # Old firmware does not support GBB flags, so let's make it an exception. if [ "$FLAGS_mod_gbb_flags" = "$FLAGS_TRUE" ]; then @@ -344,7 +344,7 @@ main() { debug_msg "Write the image" write_image || - err_die "Failed to write image. Error message: $(cat "$EXEC_LOG")" + die "Failed to write image. Error message: $(cat "${EXEC_LOG}")" debug_msg "Complete." if [ -z "$FLAGS_to" ]; then |