diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2011-04-07 09:04:05 +0800 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2011-04-07 09:04:05 +0800 |
| commit | 7f37edcf006636c40409dea8be11e4a378440e72 (patch) | |
| tree | d350113c4fd302c52a289033c3e40b6fbb4adec1 | |
| parent | c3fe59f72c95597a2d5becc8511e9d5eaf97c391 (diff) | |
| download | vboot-7f37edcf006636c40409dea8be11e4a378440e72.tar.gz | |
vboot_reference: allow using recovery_key in make_dev_ssd.
Adding --recovery_key enables make_dev_ssd to process recovery images (including
USB bootable images).
R=gauravsh@chromium.org
BUG=chromium-os:12424
TEST=./make_dev_ssd.sh --remove_rootfs_verification --recovery_key -i /dev/sdd
# then use the USB to boot on a H2C device - success.
Review URL: http://codereview.chromium.org/6799007
Change-Id: Ie983f08ff8eba9472800b2f4097915ce380a0c50
| -rwxr-xr-x | scripts/image_signing/make_dev_ssd.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh index df9bff79..a9f36a0f 100755 --- a/scripts/image_signing/make_dev_ssd.sh +++ b/scripts/image_signing/make_dev_ssd.sh @@ -30,6 +30,8 @@ DEFINE_string set_config "" \ "Base filename to load kernel configs from" "" DEFINE_string partitions "$DEFAULT_PARTITIONS" \ "List of partitions to examine" "" +DEFINE_boolean recovery_key "$FLAGS_FALSE" \ + "Use recovery key to sign image (to boot from USB" "" # Parse command line FLAGS "$@" || exit 1 @@ -255,9 +257,15 @@ main() { local num_signed=0 local num_given=$(echo "$FLAGS_partitions" | wc -w) # Check parameters - KERNEL_KEYBLOCK="$FLAGS_keys/kernel.keyblock" - KERNEL_DATAKEY="$FLAGS_keys/kernel_data_key.vbprivk" - KERNEL_PUBKEY="$FLAGS_keys/kernel_subkey.vbpubk" + if [ "$FLAGS_recovery_key" = "$FLAGS_TRUE" ]; then + KERNEL_KEYBLOCK="$FLAGS_keys/recovery_kernel.keyblock" + KERNEL_DATAKEY="$FLAGS_keys/recovery_kernel_data_key.vbprivk" + KERNEL_PUBKEY="$FLAGS_keys/recovery_key.vbpubk" + else + KERNEL_KEYBLOCK="$FLAGS_keys/kernel.keyblock" + KERNEL_DATAKEY="$FLAGS_keys/kernel_data_key.vbprivk" + KERNEL_PUBKEY="$FLAGS_keys/kernel_subkey.vbpubk" + fi debug_msg "Prerequisite check" ensure_files_exist \ |