X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=dot%2Fconfigs%2Fsetenvir;h=86401e7ec7e7b76523e715b1d47bd0b2e59dcc1a;hp=581a36cf83316230a899ca900ada4a83f873bf54;hb=771b1ad2e9b29c5b9e036b16591dacc1576e49b5;hpb=f28d69aaae306165cfcbf224581110745cdf2ce4

diff --git a/dot/configs/setenvir b/dot/configs/setenvir
index 581a36c..86401e7 100644
--- 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,34 @@ PATH=$PATH:/usr/bin/X11
 export PATH
 
 CDPATH=:..:$HOME:$HOME/things
-CVS_RSH=ssh
 
 unset MAILPATH
 
 
 
+case "$(hostname -f)" in
+*.xensource.com)
+	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 +59,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