This starts to fix the scripts so that they load from /usr/lib/crosutils

image_to_live.sh

 #!/bin/bash
 
 # Copyright (c) 2009-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 to update an image onto a live running ChromiumOS instance.
 
-# Load common constants.  This should be the first executable line.
-# The path to common.sh should be relative to your script's location.
+# --- 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
 
-. "$(dirname $0)/common.sh"
-. "$(dirname $0)/remote_access.sh"
+  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_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"
 
 # Flags to control image_to_live.
 DEFINE_boolean ignore_hostname ${FLAGS_TRUE} \
   "Ignore existing AU hostname on running instance use this hostname."
 DEFINE_boolean ignore_version ${FLAGS_TRUE} \
   "Ignore existing version on running instance and always update."
 DEFINE_string server_log "dev_server.log" \
   "Path to log for the devserver."
 DEFINE_boolean update "${FLAGS_TRUE}" \
   "Perform update of root partition."
@@ skipping 99 matching lines @@
         --image $(reinterpret_path_for_chroot ${FLAGS_image})"
     IMAGE_PATH="${FLAGS_image}"
   elif [ -n "${FLAGS_archive_dir}" ]; then
     devserver_flags="${devserver_flags} \
         --archive_dir $(reinterpret_path_for_chroot ${FLAGS_archive_dir}) -t"
     IMAGE_PATH="${FLAGS_archive_dir}/chromiumos_test_image.bin"
   else
     # IMAGE_PATH should be the newest image and learn the board from
     # the target.
     learn_board
-    IMAGE_PATH="$($(dirname "$0")/get_latest_image.sh --board="${FLAGS_board}")"
+    IMAGE_PATH="$(${SCRIPTS_DIR}/get_latest_image.sh --board="${FLAGS_board}")"
     IMAGE_PATH="${IMAGE_PATH}/chromiumos_image.bin"
     devserver_flags="${devserver_flags} \
         --image $(reinterpret_path_for_chroot ${IMAGE_PATH})"
   fi
 
   if [ -n "${FLAGS_payload}" ]; then
     devserver_flags="${devserver_flags} \
         --payload $(reinterpret_path_for_chroot ${FLAGS_payload})"
   fi
 
   if [ -n "${FLAGS_proxy_port}" ]; then
     devserver_flags="${devserver_flags} \
         --proxy_port ${FLAGS_proxy_port}"
   fi
 
   [ ${FLAGS_for_vm} -eq ${FLAGS_TRUE} ] && \
       devserver_flags="${devserver_flags} --for_vm"
 
   devserver_flags="${devserver_flags} \
       --src_image=\"$(reinterpret_path_for_chroot ${FLAGS_src_image})\""
 
   info "Starting devserver with flags ${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" &
 
   info "Waiting on devserver to start"
   info "note: be patient as the server generates the update before starting."
-  until netstat -anp 2>&1 | grep 0.0.0.0:${FLAGS_devserver_port} > /dev/null
-  do
+  until netstat -anp 2>&1 | grep 0.0.0.0:${FLAGS_devserver_port} > /dev/null; do
     sleep 5
     echo -n "."
     if ! pgrep -f start_devserver > /dev/null; then
       echo "Devserver failed, see dev_server.log."
       exit 1
     fi
   done
   echo ""
 }
 
@@ skipping 132 matching lines @@
     info "Autoupdate was successful."
     return 0
   else
     warn "Autoupdate was unsuccessful.  Status returned was ${update_status}."
     return 1
   fi
 }
 
 function verify_image {
   info "Verifying image."
-  "${SCRIPTS_DIR}/mount_gpt_image.sh" --from "$(dirname ${IMAGE_PATH})" \
+  "${SCRIPTS_DIR}/mount_gpt_image.sh" --from "$(dirname "${IMAGE_PATH}")" \
                      --image "$(basename ${IMAGE_PATH})" \
                      --read_only
 
   local lsb_release=$(cat /tmp/m/etc/lsb-release)
   info "Verifying image with release:"
   echo ${lsb_release}
 
   "${SCRIPTS_DIR}/mount_gpt_image.sh" --unmount
 
   remote_sh "cat /etc/lsb-release"
@@ skipping 10 matching lines @@
 }
 
 function find_root_dev {
   remote_sh "rootdev -s"
   echo ${REMOTE_OUT}
 }
 
 function main() {
   assert_outside_chroot
 
-  cd $(dirname "$0")
+  cd "${SCRIPTS_DIR}"
 
   FLAGS "$@" || exit 1
   eval set -- "${FLAGS_ARGV}"
 
   set -e
 
   if [ ${FLAGS_verify} -eq ${FLAGS_TRUE} ] && \
       [ -n "${FLAGS_update_url}" ]; then
     warn "Verify is not compatible with setting an update url."
     FLAGS_verify=${FLAGS_FALSE}
@@ skipping 53 matching lines @@
     local release_description=$(echo ${REMOTE_OUT} | cut -d '=' -f 2)
     info "Update was successful and rebooted to $release_description"
   fi
 
   print_time_elapsed
 
   exit 0
 }
 
 main $@