From 49b61b18ba28a40fc4139acf717deea952061818 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 9 Mar 2015 12:24:33 -0300
Subject: Keep managing /etc/bash.bashrc

---
 files/etc/profile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'files/etc/profile')

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
-- 
cgit v1.2.3