summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authornate <nate@FreeBSD.org>1999-03-17 17:39:50 +0000
committernate <nate@FreeBSD.org>1999-03-17 17:39:50 +0000
commitf4f0cbc01fcf14dd1bdf154e100d7064037a25bf (patch)
tree3c3593b91789008d9edd1e7341cd86c35718f3de /etc
parentf29f19c7578e275f2a6e9880e7a0fa29ad17b8e9 (diff)
downloadFreeBSD-src-f4f0cbc01fcf14dd1bdf154e100d7064037a25bf.zip
FreeBSD-src-f4f0cbc01fcf14dd1bdf154e100d7064037a25bf.tar.gz
Add a Q&D test before loading the pcic module to make sure there isn't
a compiled in one. Submitted by: "Sean O'Connell" <sean@stat.Duke.EDU>
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/pccard11
-rw-r--r--etc/rc.pccard11
2 files changed, 16 insertions, 6 deletions
diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 7306e7d..1402081 100644
--- a/etc/rc.d/pccard
+++ b/etc/rc.d/pccard
@@ -3,12 +3,17 @@
# PC-card startup script
# HOSOKAWA, Tatsumi <hosokawa@mt.cs.keio.ac.jp>
#
-# $Id: rc.pccard,v 1.6 1998/08/10 19:54:12 brian Exp $
+# $Id: rc.pccard,v 1.7 1999/02/04 10:06:44 markm Exp $
#
if [ "X$pccard_enable" = X"YES" ] ; then
- if kldload pcic; then
- echo "Kernel pcic module loaded."
+ builtin=`kldstat -v -n 1 | grep pcic | awk '{print $2}'`
+ if [ $builtin = 'pcic' ] ; then
+ echo "PCIC module compiled in"
+ else
+ if kldload pcic; then
+ echo "Kernel pcic module loaded."
+ fi
fi
if [ "x$pccard_mem" != "xDEFAULT" ] ; then
pccardc pccardmem $pccard_mem
diff --git a/etc/rc.pccard b/etc/rc.pccard
index 7306e7d..1402081 100644
--- a/etc/rc.pccard
+++ b/etc/rc.pccard
@@ -3,12 +3,17 @@
# PC-card startup script
# HOSOKAWA, Tatsumi <hosokawa@mt.cs.keio.ac.jp>
#
-# $Id: rc.pccard,v 1.6 1998/08/10 19:54:12 brian Exp $
+# $Id: rc.pccard,v 1.7 1999/02/04 10:06:44 markm Exp $
#
if [ "X$pccard_enable" = X"YES" ] ; then
- if kldload pcic; then
- echo "Kernel pcic module loaded."
+ builtin=`kldstat -v -n 1 | grep pcic | awk '{print $2}'`
+ if [ $builtin = 'pcic' ] ; then
+ echo "PCIC module compiled in"
+ else
+ if kldload pcic; then
+ echo "Kernel pcic module loaded."
+ fi
fi
if [ "x$pccard_mem" != "xDEFAULT" ] ; then
pccardc pccardmem $pccard_mem
OpenPOWER on IntegriCloud