X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ffiles%2Froot-dotfiles%2Fbashrc;h=2509d071e530acf7c553fdefd7f7b54f8ce33f29;hb=e9534d9354a8a2d6d4f0df5423ec033526ee8d01;hp=7b7ee59436274c284873a89ab15901534ead3c4a;hpb=93132ac1a38e33dc6d026fa5feec1f501a5cbaca;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/files/root-dotfiles/bashrc b/modules/debian-org/files/root-dotfiles/bashrc
index 7b7ee5943..2509d071e 100644
--- a/modules/debian-org/files/root-dotfiles/bashrc
+++ b/modules/debian-org/files/root-dotfiles/bashrc
@@ -1,13 +1,22 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
 
-# Note: PS1 and umask are already set in /etc/profile. You should not
-# need this unless you want different defaults for root.
-# PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
-# umask 022
-
-# You may uncomment the following lines if you want `ls' to be colorized:
-export LS_OPTIONS='--color=auto'
-eval "`dircolors`"
-alias ls='ls $LS_OPTIONS'
-alias ll='ls $LS_OPTIONS -l'
-alias l='ls $LS_OPTIONS -lA'
+## THIS FILE IS UNDER PUPPET CONTROL.
+## LOCAL CHANGES WILL BE OVERWRITTEN.
+
+if [ "$PS1" ]; then
+  typeset HISTCONTROL=ignoreboth
+
+  export LS_OPTIONS='--color=auto'
+  eval "`dircolors`"
+  alias ls='ls $LS_OPTIONS'
+  alias ll='ls $LS_OPTIONS -l'
+  alias l='ls $LS_OPTIONS -lA'
+
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  fi
+
+  PATH="$PATH:/usr/lib/nagios/plugins"
+fi
+
+# vim: set ft=sh ts=2 sw=2 et ai si: