From c5175e3ca3c6f2318aafd5c1e59a011b5369ee1c Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Sat, 16 Oct 2010 01:40:50 +0800 Subject: [PATCH] tag_image.sh: support more tags To extend the usage of tag_image, added --forget_usernames and --leave_core. Output is also refined to clarify the category of each tag parameters. BUG=none TEST=./tag_image.sh --from $PATH_TO_IMAGE; leave_core seems working fine. Change-Id: I7c6517bc98af260411518c743093ade3124b76b9 Review URL: http://codereview.chromium.org/3796003 --- scripts/image_signing/tag_image.sh | 37 ++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/scripts/image_signing/tag_image.sh b/scripts/image_signing/tag_image.sh index 143a221505..ad7bacaad2 100755 --- a/scripts/image_signing/tag_image.sh +++ b/scripts/image_signing/tag_image.sh @@ -12,10 +12,17 @@ DEFINE_string from "chromiumos_image.bin" \ "Input file name of Chrome OS image to tag/stamp." -DEFINE_string update_firmware "" \ - "Tag to force updating firmware (1 to enable, 0 to disable)" DEFINE_string dev_mode "" \ - "Tag for developer mode (1 to enable, 0 to disable)" + "(build-info) Tag as a developer mode build (1 to enable, 0 to disable)" +DEFINE_string update_firmware "" \ + "(auto-update) Force updating firmware (1 to enable, 0 to disable)" +DEFINE_string forget_usernames "" \ + "(session-manager) Forget usernames (1 to enable, 0 to disable)" +DEFINE_string leave_core "" \ + "(crash-reporter) Leave core dumps (1 to enable, 0 to disable)" + +# TODO(hungte) we can add factory_installer and factory_test, +# but I don't see any reason to tweak/check these values. # Parse command line FLAGS "$@" || exit 1 @@ -24,8 +31,8 @@ eval set -- "${FLAGS_ARGV}" # Abort on error set -e -if [ -z ${FLAGS_from} ] || [ ! -f ${FLAGS_from} ] ; then - echo "Error: invalid flag --from" +if [ -z "${FLAGS_from}" ] || [ ! -s "${FLAGS_from}" ] ; then + echo "Error: need a valid file by --from" exit 1 fi @@ -112,16 +119,28 @@ process_all_tags() { local do_modification="$2" process_tag "${do_modification}" \ - "Update Firmware" \ + "(build-info) dev_mode" \ + "${rootfs}" \ + /root/.dev_mode \ + "${FLAGS_dev_mode}" + + process_tag "${do_modification}" \ + "(auto-update) update_firmware" \ "${rootfs}" \ /root/.force_update_firmware \ "${FLAGS_update_firmware}" process_tag "${do_modification}" \ - "Developer Mode" \ + "(session-manager) forget_usernames" \ "${rootfs}" \ - /root/.dev_mode \ - "${FLAGS_dev_mode}" + /root/.forget_usernames \ + "${FLAGS_forget_usernames}" + + process_tag "${do_modification}" \ + "(crash-reporter) leave_core" \ + "${rootfs}" \ + /root/.leave_core \ + "${FLAGS_leave_core}" } IMAGE=$(readlink -f "${FLAGS_from}")