Skip to content

Commit

Permalink
Add a Q&D test before loading the pcic module to make sure there isn't
Browse files Browse the repository at this point in the history
a compiled in one.

Submitted by:	"Sean O'Connell" <[email protected]>
  • Loading branch information
YogoGit committed Mar 17, 1999
1 parent ab090e5 commit 6f88981
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
11 changes: 8 additions & 3 deletions etc/rc.d/pccard
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@
# PC-card startup script
# HOSOKAWA, Tatsumi <[email protected]>
#
# $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
Expand Down
11 changes: 8 additions & 3 deletions etc/rc.pccard
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@
# PC-card startup script
# HOSOKAWA, Tatsumi <[email protected]>
#
# $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
Expand Down

0 comments on commit 6f88981

Please sign in to comment.