mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #319 from marineam/git

Browse Source 
chroot: remove git from $PS1
This commit is contained in:
Michael Marineau 2014-08-18 16:45:05 -07:00
commit f7e4c2a109
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_lib/make_chroot.sh
View File

@ -221,17 +221,6 @@ EOF
sudo ln -s "${CHROOT_TRUNK_DIR}"/chromite "${python_path}" sudo ln -s "${CHROOT_TRUNK_DIR}"/chromite "${python_path}"
done 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 # 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 # already. This makes glibc upgrades cheap by only generating a small
# set of locales. The ones listed here are basically for the buildbots # set of locales. The ones listed here are basically for the buildbots

5
update_chroot
View File

@ -192,4 +192,9 @@ if [ "$PERL_VERSIONS" -gt 1 ] ; then
sudo perl-cleaner --all -- --quiet sudo perl-cleaner --all -- --quiet
fi 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 command_completed