mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
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
This commit is contained in:
parent
ebe1baa4ba
commit
7361be58e0
@ -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"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user