X Strike Force XFree86 SVN commit: r1852 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-09-22 13:26:46 -0500 (Wed, 22 Sep 2004)
New Revision: 1852
Modified:
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Stop grepping standard input in favor of /proc/cpuinfo. *sigh*
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 15:54:58 UTC (rev 1851)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 18:26:46 UTC (rev 1852)
@@ -1177,9 +1177,9 @@
case "$subarch" in
PowerMac*)
# Old World Macs use ADB mice, and New World Macs use USB mice.
- if grep -q 'pmac-generation.*OldWorld'; then
+ if grep -q 'pmac-generation.*OldWorld' /proc/cpuinfo; then
default_port="/dev/adbmouse"
- elif grep -q 'pmac-generation.*NewWorld'; then
+ elif grep -q 'pmac-generation.*NewWorld' /proc/cpuinfo; then
default_port="/dev/input/mice"
else
trace "$func(): cannot autodetect whether Power Macintosh is" \
Reply to: