From 7361be58e0938426102588bd44ed18455d5b3376 Mon Sep 17 00:00:00 2001
From: Doug Anderson <dianders@google.com>
Date: Wed, 15 Dec 2010 16:05:56 -0800
Subject: [PATCH] Fixed image_to_live so that it will work with the new sudo

This change will not work properly unless the chroot sudo is
updated to handle escaping properly:
  http://codereview.chromium.org/5923001

...and the chroot sudo will break image_to_live unless this
change goes in.  Thus, the two changes are intertwined.

Change-Id: Ib1602ee47178fc5d32c286e9a914111c1140252b

BUG=chromium-os:7072
TEST=Valided that the dev server seemed to be getting proper args.

Review URL: http://codereview.chromium.org/5929001
---
 image_to_live.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/image_to_live.sh b/image_to_live.sh
index 545e428b92..6c237820b5 100755
--- a/image_to_live.sh
+++ b/image_to_live.sh
@@ -153,7 +153,7 @@ function start_dev_server {
       --src_image=\"$(reinterpret_path_for_chroot ${FLAGS_src_image})\""
 
   info "Starting devserver with flags ${devserver_flags}"
-  ./enter_chroot.sh "sudo ./start_devserver ${devserver_flags} \
+  ./enter_chroot.sh -- sudo sh -c "./start_devserver ${devserver_flags} \
        --client_prefix=ChromeOSUpdateEngine \
        --board=${FLAGS_board} \
        --port=${FLAGS_devserver_port} > ${FLAGS_server_log} 2>&1" &
@@ -217,11 +217,11 @@ function get_update_args {
 function get_devserver_url {
   local devserver_url=""
   local port=${FLAGS_devserver_port}
-  
+
   if [[ -n ${FLAGS_proxy_port} ]]; then
     port=${FLAGS_proxy_port}
   fi
-  
+
   if [ ${FLAGS_ignore_hostname} -eq ${FLAGS_TRUE} ]; then
     if [ -z ${FLAGS_update_url} ]; then
       devserver_url="http://$(get_hostname):${port}/update"