add the ability to umount automounted devices from within the chroot

src/scripts/enter_chroot.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 enter the chroot environment
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Script must be run outside the chroot and as a regular user.
 assert_outside_chroot
 assert_not_root_user
 
 # Define command line flags
 # See http://code.google.com/p/shflags/wiki/Documentation10x
 DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \
   "The destination dir for the chroot environment." "d"
 DEFINE_string trunk "$GCLIENT_ROOT" \
   "The source trunk to bind mount within the chroot." "s"
 DEFINE_string build_number "" \
   "The build-bot build number (when called by buildbot only)." "b"
 DEFINE_string chrome_root "" \
   "The root of your chrome browser source. Should contain a 'src' subdir."
+DEFINE_string automount_dir "/media" \
+  "The directory in which your host OS creates mountpoints for external media."
 
 DEFINE_boolean official_build $FLAGS_FALSE \
   "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_boolean mount $FLAGS_FALSE "Only set up mounts."
 DEFINE_boolean unmount $FLAGS_FALSE "Only tear down mounts."
 
 # More useful help
 FLAGS_HELP="USAGE: $0 [flags] [VAR=value] [-- \"command\"]
 
 One or more VAR=value pairs can be specified to export variables into
@@ skipping 56 matching lines @@
           die "Could not mount $MOUNTED_PATH"
     fi
 
     MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}/dev")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]
     then
       sudo mount --bind /dev "$MOUNTED_PATH" || \
           die "Could not mount $MOUNTED_PATH"
     fi
 
+    MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${FLAGS_automount_dir}")"
+    if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]
+    then
+      sudo mount --bind "${FLAGS_automount_dir}" "$MOUNTED_PATH" || \
+          die "Could not mount $MOUNTED_PATH"
+    fi
+
     MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}$CHROOT_TRUNK_DIR")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]
     then
       sudo mount --bind "$FLAGS_trunk" "$MOUNTED_PATH" || \
           die "Could not mount $MOUNTED_PATH"
     fi
 
     MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_CHROME_ROOT}")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]
     then
@@ skipping 126 matching lines @@
 
 # Run command or interactive shell.  Also include the non-chrooted path to
 # the source trunk for scripts that may need to print it (e.g.
 # build_image.sh).
 sudo chroot "$FLAGS_chroot" sudo -i -u $USER $CHROOT_PASSTHRU \
   EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" LANG=C "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
 teardown_env