Misc. fixes to versioning.

src/scripts/build_image.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 build a bootable keyfob-based chromeos system image.
 # It uses debootstrap (see https://wiki.ubuntu.com/DebootstrapChroot) to
 # create a base file system. It then cusotmizes the file system and adds
 # Ubuntu and chromeos specific packages. Finally, it creates a bootable USB
@@ skipping 190 matching lines @@
 cd -
 
 # File-type mirrors have a different path when bind-mounted inside the chroot
 # ${FOO/bar/baz} replaces bar with baz when evaluating $FOO.
 MIRROR_INSIDE="${FLAGS_mirror/$GCLIENT_ROOT//trunk}"
 MIRROR2_INSIDE="${FLAGS_mirror2/$GCLIENT_ROOT//trunk}"
 
 # Write options for customize script into the chroot
 CUST_OPTS="${SETUP_DIR}/customize_opts.sh"
 cat <<EOF > $CUST_OPTS
+REAL_USER=$USER
 SETUP_DIR="$ROOTFS_SETUP_DIR"
 KERNEL_VERSION="$KERNEL_VERSION"
 SERVER="$MIRROR_INSIDE"
 SUITE="$FLAGS_suite"
 SERVER2="$MIRROR2_INSIDE"
 SUITE2="$FLAGS_suite2"
 EOF
 # ...and all CHROMEOS_ vars
 set | egrep "^CHROMEOS_|^BUILDBOT_" >> $CUST_OPTS
 
@@ skipping 54 matching lines @@
 EOF
 
 OUTSIDE_OUTPUT_DIR="${EXTERNAL_TRUNK_PATH}/src/build/images/${IMAGE_SUBDIR}"
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "To copy to USB keyfob, outside the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdb"
 echo "To convert to VMWare image, outside the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 
 trap - EXIT