*: remove restart_in_chroot_if_needed

Replace calls to restart_in_chroot_if_needed with assert_inside_chroot.
This removes a dependency on chromite.

build_docker_aci

@@ -11,7 +11,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

build_image

@@ -13,7 +13,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

build_oem_aci

@@ -11,7 +11,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

build_packages

@@ -7,7 +7,7 @@
 . "$(dirname "$0")/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

build_torcx_store

@@ -7,7 +7,7 @@
 . "$(dirname "$0")/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

common.sh

@@ -417,16 +417,6 @@ warn_if_nfs() {
   fi
 }
 
-# Enter a chroot and restart the current script if needed
-restart_in_chroot_if_needed() {
-  # NB:  Pass in ARGV:  restart_in_chroot_if_needed "$@"
-  if [[ ${INSIDE_CHROOT} -ne 1 ]]; then
-    # Get inside_chroot path for script.
-    local chroot_path="$(reinterpret_path_for_chroot "$0")"
-    exec ${GCLIENT_ROOT}/chromite/bin/cros_sdk -- "${chroot_path}" "$@"
-  fi
-}
-
 # Fail unless we're inside the chroot.  This guards against messing up your
 # workstation.
 assert_inside_chroot() {

image_inject_bootchain

@@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname "$(readlink -f "$0")")
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

image_set_group

@@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname "$(readlink -f "$0")")
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

image_to_vm.sh

@@ -13,7 +13,7 @@ SCRIPT_ROOT=$(dirname "$(readlink -f "$0")")
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

kernel_menuconfig

@@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname "$(readlink -f "$0")")
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

rebuild_packages

@@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

set_official

@@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

setup_board

@@ -8,7 +8,7 @@
 . "${BUILD_LIBRARY_DIR}/toolchain_util.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

start_devserver

@@ -10,7 +10,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 
 # Script must be run inside the chroot if not in 'always serve' mode.
 if [[ "$1" != "--archive_dir" ]]; then
-  restart_in_chroot_if_needed "$@"
+  assert_inside_chroot
 fi
 
 # This is the location of the script now.