diff options
| author | Mike Frysinger <vapier@chromium.org> | 2012-10-17 01:05:50 -0400 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-10-16 23:25:29 -0700 |
| commit | 8b42ac8e2682ee763a13baffe815b771d2103403 (patch) | |
| tree | 69afd3faeb4ffe6ac0f485b8cbf50f19e5493ea5 | |
| parent | b59d06e6e8ef43e37dd568c2b5ae20d7b4b42433 (diff) | |
| download | vboot-8b42ac8e2682ee763a13baffe815b771d2103403.tar.gz | |
Key increment scripts: fix incrementing keys not in $PWD
Part of the recent rewrite dropped changing of the active dir to
${KEY_DIR}. Meant the scripts needed to be run inside of the key
dir since not all functions take the key dir as an argument but
instead assume they're in ${PWD}.
BUG=None
TEST=Ran increment_kernel_subkey_and_key_mp.sh and saw it work
BRANCH=None
Change-Id: Icbc02f123e999d186d9c40fd16528a134397699e
Reviewed-on: https://gerrit.chromium.org/gerrit/35803
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
5 files changed, 10 insertions, 4 deletions
diff --git a/scripts/keygeneration/common.sh b/scripts/keygeneration/common.sh index b7725add..c3c1c25d 100755 --- a/scripts/keygeneration/common.sh +++ b/scripts/keygeneration/common.sh @@ -125,6 +125,8 @@ get_version() { # Loads the current versions prints them to stdout and sets the global version # variables: CURR_FIRMKEY_VER CURR_FIRM_VER CURR_KERNKEY_VER CURR_KERN_VER load_current_versions() { + local key_dir=$1 + local VERSION_FILE="${key_dir}/${VERSION_FILE}" if [[ ! -f ${VERSION_FILE} ]]; then return 1 fi diff --git a/scripts/keygeneration/increment_firmware_data_key.sh b/scripts/keygeneration/increment_firmware_data_key.sh index facd776d..c6b65a45 100755 --- a/scripts/keygeneration/increment_firmware_data_key.sh +++ b/scripts/keygeneration/increment_firmware_data_key.sh @@ -24,9 +24,10 @@ fi KEY_DIR=$1 main() { - load_current_versions + load_current_versions "${KEY_DIR}" new_firmkey_ver=$(increment_version "${KEY_DIR}" "firmware_key_version") + cd "${KEY_DIR}" backup_existing_firmware_keys ${CURR_FIRM_VER} ${CURR_FIRMKEY_VER} cat <<EOF diff --git a/scripts/keygeneration/increment_kernel_data_key.sh b/scripts/keygeneration/increment_kernel_data_key.sh index 193df2ae..b3ed3ea5 100755 --- a/scripts/keygeneration/increment_kernel_data_key.sh +++ b/scripts/keygeneration/increment_kernel_data_key.sh @@ -24,9 +24,10 @@ fi KEY_DIR=$1 main() { - load_current_versions + load_current_versions "${KEY_DIR}" new_kernkey_ver=$(increment_version "${KEY_DIR}" "kernel_key_version") + cd "${KEY_DIR}" backup_existing_kernel_data_keys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER} cat <<EOF diff --git a/scripts/keygeneration/increment_kernel_subkey.sh b/scripts/keygeneration/increment_kernel_subkey.sh index b18847e7..ccac9373 100755 --- a/scripts/keygeneration/increment_kernel_subkey.sh +++ b/scripts/keygeneration/increment_kernel_subkey.sh @@ -24,9 +24,10 @@ fi KEY_DIR=$1 main() { - load_current_versions + load_current_versions "${KEY_DIR}" new_firm_ver=$(increment_version "${KEY_DIR}" "firmware_version") + cd "${KEY_DIR}" backup_existing_kernel_subkeys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER} cat <<EOF diff --git a/scripts/keygeneration/increment_kernel_subkey_and_key.sh b/scripts/keygeneration/increment_kernel_subkey_and_key.sh index ac846605..dda04166 100755 --- a/scripts/keygeneration/increment_kernel_subkey_and_key.sh +++ b/scripts/keygeneration/increment_kernel_subkey_and_key.sh @@ -25,10 +25,11 @@ fi KEY_DIR=$1 main() { - load_current_versions + load_current_versions "${KEY_DIR}" new_kernkey_ver=$(increment_version "${KEY_DIR}" "kernel_key_version") new_firm_ver=$(increment_version "${KEY_DIR}" "firmware_version") + cd "${KEY_DIR}" backup_existing_kernel_subkeys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER} backup_existing_kernel_data_keys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER} |