Misc. fixes to versioning.

src/scripts/customize_rootfs.sh

Index: src/scripts/customize_rootfs.sh
diff --git a/src/scripts/customize_rootfs.sh b/src/scripts/customize_rootfs.sh
index 1014d9f86d0b6c8407d94576782d86e1feb3a1a4..e5e93bdee309fb3707949b8a9f05e3f1836e3617 100755
--- a/src/scripts/customize_rootfs.sh
+++ b/src/scripts/customize_rootfs.sh
@@ -42,14 +42,16 @@ 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: