From 2991ad8cd898d3710d328fc4e8569f602149550d Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 18 Aug 2014 16:23:37 -0700
Subject: [PATCH] chroot: remove git from $PS1

This feature is disabled for now. See c8a62a12 for details.
---
 sdk_lib/make_chroot.sh | 11 -----------
 update_chroot          |  5 +++++
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index e59ed2af8d..29814f005d 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -221,17 +221,6 @@ EOF
      sudo ln -s "${CHROOT_TRUNK_DIR}"/chromite "${python_path}"
    done
 
-   target="${FLAGS_chroot}/etc/profile.d"
-   mkdir -p "${target}"
-   cat << EOF > "${target}/coreos-niceties.sh"
-# Niceties for interactive logins. (cr) denotes this is a chroot, the
-# __git_branch_ps1 prints current git branch in ./ . The $r behavior is to
-# make sure we don't reset the previous $? value which later formats in
-# $PS1 might rely on.
-PS1='\$(r=\$?; __git_branch_ps1 "(%s) "; exit \$r)'"\${PS1}"
-PS1="(cr) \${PS1}"
-EOF
-
    # Select a small set of locales for the user if they haven't done so
    # already.  This makes glibc upgrades cheap by only generating a small
    # set of locales.  The ones listed here are basically for the buildbots
diff --git a/update_chroot b/update_chroot
index 7a2b419150..332f49e098 100755
--- a/update_chroot
+++ b/update_chroot
@@ -192,4 +192,9 @@ if [ "$PERL_VERSIONS" -gt 1 ] ; then
   sudo perl-cleaner --all -- --quiet
 fi
 
+# Old $PS1 customization that doesn't work any more
+if [[ -e /etc/profile.d/coreos-niceties.sh ]]; then
+  sudo rm -f /etc/profile.d/coreos-niceties.sh
+fi
+
 command_completed