scripts: call devserver/payload generators from chroot & delete moved scripts

start_devserver

Index: start_devserver
diff --git a/start_devserver b/start_devserver
index 6d4cddbba4d4936c08f5920e5e0dba1da6ba8e1c..ee491c488fe42eb4c56a26d046aff76d9dfa7a98 100755
--- a/start_devserver
+++ b/start_devserver
@@ -1,44 +1,4 @@
 #!/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.
-
-# Start the Dev Server after making sure we are running under a chroot.
-
-# --- BEGIN COMMON.SH BOILERPLATE ---
-# Load common CrOS utilities.  Inside the chroot this file is installed in
-# /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
-# location.
-find_common_sh() {
-  local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")"))
-  local path
-
-  SCRIPT_ROOT=
-  for path in "${common_paths[@]}"; do
-    if [ -r "${path}/common.sh" ]; then
-      SCRIPT_ROOT=${path}
-      break
-    fi
-  done
-}
-
-find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
-# --- END COMMON.SH BOILERPLATE ---
-
-# Script must be run inside the chroot if not in 'always serve' mode.
-if [[ "$1" != "--archive_dir" ]]; then
-  restart_in_chroot_if_needed "$@"
-fi

[sosa, 2011/03/01 21:39:18]

Do exec here.

-
-# Temporary workaround: to start devserver for update engine, pass in args
-# --client_prefix ChromeOSUpdateEngine
-
-# Set PKG_INSTALL_MASK if it's not set already.
-if [ -z "${PKG_INSTALL_MASK+x}" ]; then
-  export PKG_INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
-fi
-echo PKG_INSTALL_MASK=$PKG_INSTALL_MASK
-
-cd ${GCLIENT_ROOT}/src/platform/dev && python devserver.py "$@"
+# This is the location of the script now.
+exec $(dirname ${0})/../../chroot/usr/bin/start_devserver

[sosa, 2011/03/01 21:39:18]

You should keep the old code until after the if if restart fi.  Otherwise
external ppl without chroots will die.