Only cache sudo if outside chroot

src/scripts/image_to_usb.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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 convert the output of build_image.sh to a usb image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 33 matching lines @@
   FLAGS_test_image=${FLAGS_TRUE}
 fi
 
 # Inside the chroot, so output to usb.img in the same dir as the other
 # Script can be run either inside or outside the chroot.
 if [ ${INSIDE_CHROOT} -eq 1 ]
 then
   SYSROOT="${FLAGS_build_root}/${FLAGS_board}"
 else
   SYSROOT="${DEFAULT_CHROOT_DIR}${FLAGS_build_root}/${FLAGS_board}"
+  echo "Caching sudo authentication"
+  sudo -v
+  echo "Done"
 fi
 AUTOTEST_SRC="${SYSROOT}/usr/local/autotest"
 
 # Die on any errors.
 set -e
 
 # No board, no default and no image set then we can't find the image
 if [ -z ${FLAGS_from} ] && [ -z ${FLAGS_board} ] ; then
   setup_board_warning
   exit 1
@@ skipping 23 matching lines @@
     # Outside the chroot, so output to the default device for a usb key.
     FLAGS_to="/dev/sdb"
   fi
 fi
 
 # Convert args to paths.  Need eval to un-quote the string so that shell
 # chars like ~ are processed; just doing FOO=`readlink -f ${FOO}` won't work.
 FLAGS_from=`eval readlink -f ${FLAGS_from}`
 FLAGS_to=`eval readlink -f ${FLAGS_to}`
 
-# Done evaluating arguments, lets go!
-echo "Caching sudo authentication"
-sudo -v
-echo "Done"
-
 # Use this image as the source image to copy
 SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"
 
 # If we're asked to modify the image for test, then let's make a copy and
 # modify that instead.
 if [ ${FLAGS_test_image} -eq ${FLAGS_TRUE} ] ; then
   if [ ! -f "${FLAGS_from}/chromiumos_test_image.bin" ] || \
      [ ${FLAGS_force_copy} -eq ${FLAGS_TRUE} ] ; then
     # Copy it.
     echo "Creating test image from original..."
@@ skipping 130 matching lines @@
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdb bs=4M"
   echo "where /dev/sdb is the entire keyfob."
   if [ ${INSIDE_CHROOT} -eq 1 ]
   then
     example=$(basename "${FLAGS_to}")
     echo "NOTE: Since you are currently inside the chroot, and you'll need to"
     echo "run dd outside the chroot, the path to the USB image will be"
     echo "different (ex: ~/chromeos/trunk/src/build/images/SOME_DIR/$example)."
   fi
 fi