Clean up cros_make_image_bootable and image_to_vm

bin/cros_make_image_bootable

 #!/bin/bash
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Script which ensures that a given image has an up-to-date
 # kernel partition, rootfs integrity hashes, and legacy bootloader configs.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 COMMON_PATH="$(dirname "$0")/../common.sh"
 if [ ! -r "${COMMON_PATH}" ]; then
   echo "ERROR! Cannot find common.sh: ${COMMON_PATH}" 1>&2
   exit 1
 fi
 . "$(dirname "$0")/../common.sh"
 
 set -e
 . "$(dirname "$0")/../chromeos-common.sh"  # for partoffset and partsize
 
+if [ $# -lt 2 ]; then
+  echo "Usage: ${0} /PATH/TO/IMAGE IMAGE.BIN [shflags overrides]"
+  exit 1
+fi
+
 BOOT_DESC_FILE="${1}/boot.desc"
 IMAGE="${1}/${2}"
+shift
+shift
+FLAG_OVERRIDES="${@}"
 
 if [ ! -r "${BOOT_DESC_FILE}" ]; then
-  warning "${BOOT_DESC_FILE} cannot be read!"
-  warning "Falling back to command line parsing"
+  warn "${BOOT_DESC_FILE} cannot be read!"
+  warn "Falling back to command line parsing"
   BOOT_DESC="${@}"
 else
   BOOT_DESC="$(cat ${BOOT_DESC_FILE} | tr -s '\n' ' ')"
   info "Boot-time configuration for $(dirname ${IMAGE}): "
   cat ${BOOT_DESC_FILE} | while read line; do
     info "  ${line}"
   done
 fi
 
 if [ ! -r "${IMAGE}" ]; then
@@ skipping 47 matching lines @@
 DEFINE_string rootfs_mountpoint "/tmp/rootfs" \
   "Path where the rootfs can be safely mounted"
 DEFINE_string statefulfs_mountpoint "/tmp/statefulfs" \
   "Path where the statefulfs can be safely mounted"
 DEFINE_string espfs_mountpoint "/tmp/espfs" \
   "Path where the espfs can be safely mounted"
 
 DEFINE_boolean use_dev_keys ${FLAGS_FALSE} \
   "Use developer keys for signing. (Default: false)"
 
-# Parse command-line flags present after positional args, if any. This needs
-# to happen before we parse boot.desc (otherwise the flags would be lost)
-FLAGS "${@}" || exit 1
-
-# Parse the boot.desc
-eval set -- "${BOOT_DESC}"
+# Parse the boot.desc and any overrides
+eval set -- "${BOOT_DESC} ${FLAG_OVERRIDES}"
 FLAGS "${@}" || exit 1
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'set -e' is specified before now.
 set -e -u
 
 # $1 - Directory where developer rootfs is mounted.
 # $2 - Directory where developer stateful_partition is mounted.
 # $3 - Directory where the ESP partition is mounted.
 mount_gpt_cleanup() {
@@ skipping 137 matching lines @@
 mkdir -p ${FLAGS_statefulfs_mountpoint}
 mkdir -p ${FLAGS_espfs_mountpoint}
 
 make_image_bootable ${IMAGE}
 
 if [ ${FLAGS_cleanup_dirs} -eq ${FLAGS_TRUE} ]; then
   rmdir ${FLAGS_rootfs_mountpoint}
   rmdir ${FLAGS_statefulfs_mountpoint}
   rmdir ${FLAGS_espfs_mountpoint}
 fi