Pseudo-merge of mariner/msriner

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

diff --git a/dot/configs/setenvir b/dot/configs/setenvir
index 01722a56ba936be572e3b7c91012c08e336fa5ff..a1ac995054a9bba3755a09fedb6e7c7e9049d6b4 100644 (file)
--- a/dot/configs/setenvir
+++ b/dot/configs/setenvir
@@ -7,13 +7,6 @@ PATH=$HOME/personal/linux-i386/bin:$HOME/personal/scripts/bin
 CVS_RSH=ssh
 
 
-
-DEBEMAIL=ijackson@chiark.greenend.org.uk
-EMAIL=ijackson@chiark.greenend.org.uk
-export DEBEMAIL EMAIL
-
-
-
 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
@@ -32,6 +25,23 @@ 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
+
+
+
+
 
 
 EDITOR=emacs
@@ -51,6 +61,21 @@ 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
+       export XEN_COMPILE_ARCH
+fi
+
+
+if [ "x$debian_chroot" = x ] && test -f /etc/debian_chroot; then
+       read </etc/debian_chroot debian_chroot
+       debian_chroot="($debian_chroot)"
+       export debian_chroot
+fi
+
 
 
 unset ignoreeof