commit 61394a2995ee8f8b6b1cd6df409c85ed1e3baa95
author Steve Fung <stevefung@chromium.org> Tue Oct 14 02:13:07 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Oct 18 01:37:01 2014 +0000
tree 5150049c4ed87333f44c09bf50ab2a96156de3d2
parent 034cac1f25e4c17a1e53bab2bebb11384098a328

Convert Update Engine arguments to base::CommandLine compatible format

base::CommandLine doesn't handle space-delimited flag-value pairs.  Any
non-bool flag must use an '=' as the delimiter.

BUG=chromium:402636
TEST=`cbuildbot --remote --hwtest falco-paladin`

Change-Id: I79112aa60d1f27ff0e5b8ee96f1ae46ee9a89a59
Reviewed-on: https://chromium-review.googlesource.com/223328
Reviewed-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Steve Fung <stevefung@chromium.org>
Tested-by: Steve Fung <stevefung@chromium.org>

host/cros_generate_update_payload

diff --git a/host/cros_generate_update_payload b/host/cros_generate_update_payload
index 86a9637..186c496 100755
--- a/host/cros_generate_update_payload
+++ b/host/cros_generate_update_payload
@@ -319,30 +319,30 @@
   # Preserve the path during sudo so that unpacked binaries are used when
   # outside the chroot.
   sudo PATH=${PATH} "${GENERATOR}" \
-      -new_dir "${DST_MNT}" -new_image "${DST_ROOT}" \
-      -new_kernel "${DST_KERNEL}" \
-      -old_dir "${SRC_MNT}" -old_image "${SRC_ROOT}" \
-      -old_kernel "${SRC_KERNEL}" \
-      -out_file "${FLAGS_output}" -private_key "${FLAGS_private_key}" \
-      -chunk_size "${FLAGS_chunk_size}" \
+      -new_dir="${DST_MNT}" -new_image="${DST_ROOT}" \
+      -new_kernel="${DST_KERNEL}" \
+      -old_dir="${SRC_MNT}" -old_image="${SRC_ROOT}" \
+      -old_kernel="${SRC_KERNEL}" \
+      -out_file="${FLAGS_output}" -private_key="${FLAGS_private_key}" \
+      -chunk_size="${FLAGS_chunk_size}" \
       "${PARTITION_SIZE_PARAM}" \
-      -old_channel "${FLAGS_src_channel}" -old_board "${FLAGS_src_board}" \
-      -old_version "${FLAGS_src_version}" -old_key "${FLAGS_src_key}" \
-      -old_build_channel "${FLAGS_src_build_channel}" \
-      -old_build_version "${FLAGS_src_build_version}" \
-      -new_channel "${FLAGS_channel}" -new_board "${FLAGS_board}" \
-      -new_version "${FLAGS_version}" -new_key "${FLAGS_key}" \
-      -new_build_channel "${FLAGS_build_channel}" \
-      -new_build_version "${FLAGS_build_version}"
+      -old_channel="${FLAGS_src_channel}" -old_board="${FLAGS_src_board}" \
+      -old_version="${FLAGS_src_version}" -old_key="${FLAGS_src_key}" \
+      -old_build_channel="${FLAGS_src_build_channel}" \
+      -old_build_version="${FLAGS_src_build_version}" \
+      -new_channel="${FLAGS_channel}" -new_board="${FLAGS_board}" \
+      -new_version="${FLAGS_version}" -new_key="${FLAGS_key}" \
+      -new_build_channel="${FLAGS_build_channel}" \
+      -new_build_version="${FLAGS_build_version}"
 else
   "${GENERATOR}" \
-      -new_image "${DST_ROOT}" -new_kernel "${DST_KERNEL}" \
-      -out_file "${FLAGS_output}" -private_key "${FLAGS_private_key}" \
+      -new_image="${DST_ROOT}" -new_kernel="${DST_KERNEL}" \
+      -out_file="${FLAGS_output}" -private_key="${FLAGS_private_key}" \
       "${PARTITION_SIZE_PARAM}" \
-      -new_channel "${FLAGS_channel}" -new_board "${FLAGS_board}" \
-      -new_version "${FLAGS_version}" -new_key "${FLAGS_key}" \
-      -new_build_channel "${FLAGS_build_channel}" \
-      -new_build_version "${FLAGS_build_version}"
+      -new_channel="${FLAGS_channel}" -new_board="${FLAGS_board}" \
+      -new_version="${FLAGS_version}" -new_key="${FLAGS_key}" \
+      -new_build_channel="${FLAGS_build_channel}" \
+      -new_build_version="${FLAGS_build_version}"
 fi
 
 if [[ -n "${FLAGS_out_metadata_hash_file}" ]]; then
@@ -352,9 +352,9 @@
     # size used. The value 256 is the number of bytes the SHA-256 hash
     # value of the manifest signed with a 2048-bit RSA key occupies.
     "${GENERATOR}" \
-        -in_file "${FLAGS_output}" \
-        -signature_size 256 \
-        -out_metadata_hash_file "${FLAGS_out_metadata_hash_file}"
+        -in_file="${FLAGS_output}" \
+        -signature_size=256 \
+        -out_metadata_hash_file="${FLAGS_out_metadata_hash_file}"
 fi
 
 echo "Done generating ${PAYLOAD_TYPE} update."

host/image_to_live.sh

diff --git a/host/image_to_live.sh b/host/image_to_live.sh
index 1143fca..be0fd40 100755
--- a/host/image_to_live.sh
+++ b/host/image_to_live.sh
@@ -263,7 +263,7 @@
     die "No url provided for update."
   fi
 
-  local update_args="--omaha_url ${1}"
+  local update_args="--omaha_url=${1}"
 
   info "Omaha URL: " ${update_args}