[24276] in Source-Commits
/svn/athena r23874 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (andrew m. boardman)
Thu Jun 18 17:48:22 2009
Date: Thu, 18 Jun 2009 17:48:10 -0400
From: "andrew m. boardman" <amb@MIT.EDU>
Message-Id: <200906182148.n5ILmAho021364@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: amb
Date: 2009-06-18 17:48:10 -0400 (Thu, 18 Jun 2009)
New Revision: 23874
Modified:
trunk/debathena/scripts/installer/install-debathena.sh
Log:
Conditionalize forcing fglrx on intrepid; jaunty works OK as-is.
Modified: trunk/debathena/scripts/installer/install-debathena.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.sh 2009-06-18 21:42:56 UTC (rev 23873)
+++ trunk/debathena/scripts/installer/install-debathena.sh 2009-06-18 21:48:10 UTC (rev 23874)
@@ -164,15 +164,18 @@
# Free up designated LVM overhead.
lvremove -f /dev/athena/keep_2 || :
- # This makes gx755s suck less.
- if lspci -n|grep -q 1002:94c1 && ! grep -q radeonhd /etc/X11/xorg.conf ; then
- DEBIAN_FRONTEND=noninteractive aptitude -y install xserver-xorg-video-radeonhd
- cat >> /etc/X11/xorg.conf <<EOF
+ if [ "$distro" = intrepid ] ; then
+ # This makes gx755s suck less with Intrepid's slightly broken xorg modules.
+ # (It's likely we'll want some hardware-specific stuff for Jaunty as well.)
+ if lspci -n|grep -q 1002:94c1 && ! grep -q radeonhd /etc/X11/xorg.conf ; then
+ DEBIAN_FRONTEND=noninteractive aptitude -y install xserver-xorg-video-radeonhd
+ cat >> /etc/X11/xorg.conf <<EOF
Section "Device"
Identifier "Configured Video Device"
Driver "radeonhd"
EndSection
EOF
+ fi
fi
fi
else
