Misc. fixes to versioning.

src/scripts/customize_rootfs.sh

 #!/bin/sh
 
 # 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.
 
 # Customizes the root file system of a chromium-based os.
 # NOTE: This script should be called by build_image.sh. Do not run this
 # on your own unless you know what you are doing.
 
@@ skipping 24 matching lines @@
   # Use a random password.  unix_md5_crypt will generate a random salt.
   echo "Using random password."
   PASSWORD="$(base64 /dev/urandom | head -1)"
   CRYPTED_PASSWD="$(echo "$PASSWORD" | openssl passwd -1 -stdin)"
   PASSWORD="gone now"
 fi
 
 # Set CHROMEOS_VERSION_DESCRIPTION here (uses vars set in chromeos_version.sh)
 # Was removed from chromeos_version.sh which can also be run outside of chroot
 # where CHROMEOS_REVISION is set
+# We have to set (in build_image.sh) and use REAL_USER due to many nested 
+# chroots which lose $USER state.
 if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]; then
-   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
-elif [ "$USER" = "chrome-bot" ]
+  export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
+elif [ "$REAL_USER" = "chrome-bot" ]
 then
-   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build ${CHROMEOS_REVISION:?} - Builder: ${BUILDBOT_BUILD:-"N/A"})"
+  export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Continuous Build ${CHROMEOS_REVISION:?} - Builder: ${BUILDBOT_BUILD:-"N/A"})"
 else
-   # Use the $USER passthru via $CHROMEOS_RELEASE_CODENAME
-   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build ${CHROMEOS_REVISION:?} - $(date) - $CHROMEOS_RELEASE_CODENAME)"
+  # Use the $USER passthru via $CHROMEOS_RELEASE_CODENAME
+  export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build ${CHROMEOS_REVISION:?} - $(date) - $CHROMEOS_RELEASE_CODENAME)"
 fi
 
 # Set google-specific version numbers:
 # CHROMEOS_RELEASE_CODENAME is the codename of the release.
 # CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see
 #   chrome/browser/chromeos/chromeos_version_loader.cc.
 # CHROMEOS_RELEASE_NAME is a human readable name for the build.
 # CHROMEOS_RELEASE_TRACK and CHROMEOS_RELEASE_VERSION are used by the software
 #   update service.
 # TODO(skrul):  Remove GOOGLE_RELEASE once Chromium is updated to look at
@@ skipping 131 matching lines @@
 cat <<EOF > /etc/network/interfaces
 auto lo
 iface lo inet loopback
 EOF
 
 cat <<EOF > /etc/resolv.conf
 # Use the connman dns proxy.
 nameserver 127.0.0.1
 EOF
 chmod a-wx /etc/resolv.conf