aboutsummaryrefslogtreecommitdiff
path: root/files/etc/profile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-03-09 12:24:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-03-09 12:24:33 -0300
commit49b61b18ba28a40fc4139acf717deea952061818 (patch)
tree258867a7844be9353da56e4d6b70b50f9065d2ae /files/etc/profile
parent150ad07e99e8450ef22b707ef610559493567a9f (diff)
downloadpuppet-nodo-49b61b18ba28a40fc4139acf717deea952061818.tar.gz
puppet-nodo-49b61b18ba28a40fc4139acf717deea952061818.tar.bz2
Keep managing /etc/bash.bashrc
Diffstat (limited to 'files/etc/profile')
-rw-r--r--files/etc/profile5
1 files changed, 1 insertions, 4 deletions
diff --git a/files/etc/profile b/files/etc/profile
index 5a89ea5..51d0430 100644
--- a/files/etc/profile
+++ b/files/etc/profile
@@ -9,7 +9,7 @@ fi
export PATH
if [ "$PS1" ]; then
- if [ "$BASH" ]; then
+ if [ "$BASH" ] && [ "$BASH" != "/bin/sh" ]; then
# The file bash.bashrc already sets the default PS1.
# PS1='\h:\w\$ '
if [ -f /etc/bash.bashrc ]; then
@@ -24,9 +24,6 @@ if [ "$PS1" ]; then
fi
fi
-# The default umask is now handled by pam_umask.
-# See pam_umask(8) and /etc/login.defs.
-
if [ -d /etc/profile.d ]; then
for i in /etc/profile.d/*.sh; do
if [ -r $i ]; then