From d61741ceaed181ea0ca9a8cb495531011fd1d43f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 27 Feb 2001 19:45:15 +0000
Subject: don't run isapnp on isapnp-enabled 2.4 kernels

---
 rc.d/rc.sysinit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 24fe506d..e533df1c 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -257,7 +257,7 @@ else
 fi
 
 # set up pnp 
-if [ -x /sbin/isapnp -a -f /etc/isapnp.conf ]; then
+if [ -x /sbin/isapnp -a -f /etc/isapnp.conf -a ! -f /proc/isapnp ]; then
     if [ -n "$PNP" ]; then
 	action $"Setting up ISA PNP devices: " /sbin/isapnp /etc/isapnp.conf
     else
-- 
cgit v1.2.1