Pseudo-merge of mariner/msriner

[ian-dotfiles.git] / dot / configs / setenvir

diff --git a/dot/configs/setenvir b/dot/configs/setenvir
index 581a36cf83316230a899ca900ada4a83f873bf54..a1ac995054a9bba3755a09fedb6e7c7e9049d6b4 100644 (file)
--- a/dot/configs/setenvir
+++ b/dot/configs/setenvir
@@ -4,16 +4,12 @@
 PATH=$HOME/personal/linux-i386/bin:$HOME/personal/scripts/bin
 
 
+CVS_RSH=ssh
 
 
-
-
-PATH=$PATH:/usr/lib/ccache:/usr/lib/git-core
-
-
-
-
+PATH=$PATH:/usr/lib/ccache
 PATH=$PATH:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/sbin:/usr/sbin
+PATH=$PATH:/usr/lib/git-core
 
 
 
@@ -24,26 +20,36 @@ PATH=$PATH:/usr/bin/X11
 export PATH
 
 CDPATH=:..:$HOME:$HOME/things
-CVS_RSH=ssh
 
 unset MAILPATH
 
 
 
+case "$(hostname -f)" in
+*.xensource.com)
+       GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com
+       export GIT_COMMITTER_EMAIL
+       NNTPAUTH="md5cookie1way ijacksonxen"
+       NNTPSERVER=tunnel.chiark.greenend.org.uk
+       export NNTPAUTH NNTPSERVER
+       ;;
+*)
+        EMAIL=ijackson@chiark.greenend.org.uk
+        DEBEMAIL=ijackson@chiark.greenend.org.uk
+        ;;
+esac
+
 
 
 
-NNTPAUTH="md5cookie1way ijacksonxen"
-NNTPSERVER=tunnel.chiark.greenend.org.uk
-export NNTPAUTH NNTPSERVER
-export GIT_COMMITTER_EMAIL=Ian.Jackson@eu.citrix.com
 
 
 EDITOR=emacs
 HISTORY=256
 HOST=`hostname`
-LANG=C
+#LANG=C
 LESS="-eMfQj10"
+# NNTPAUTH="md5cookie1way ian"
 PAGER=less
 # PERLLIB=$HOME/personal/linux/lib/perl5
 PS1="$ "
@@ -55,6 +61,8 @@ export PAGER PERLLIB PS1 TRNINIT WWW_HOME
 
 # NNTPAUTH
 
+LVM_SUPPRESS_FD_WARNINGS=1
+export LVM_SUPPRESS_FD_WARNINGS
 
 if test -d /mariner64; then
        XEN_COMPILE_ARCH=x86_32