diff --git a/etc/rc b/etc/rc index 8fc9e4066a8d..e06d0e17b625 100644 --- a/etc/rc +++ b/etc/rc @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.85 1996/02/23 10:44:49 adam Exp $ +# $Id: rc,v 1.86 1996/03/12 15:39:24 nate Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -95,8 +95,8 @@ if [ -f /etc/rc.serial ]; then fi # start up PC-card configuration -if [ -f /etc/pccardstart ]; then - . /etc/pccardstart +if [ -f /etc/rc.pccard ]; then + . /etc/rc.pccard fi # start up the network diff --git a/etc/pccard_start b/etc/rc.d/pccard similarity index 89% rename from etc/pccard_start rename to etc/rc.d/pccard index e96f30773d38..597e89450ef6 100644 --- a/etc/pccard_start +++ b/etc/rc.d/pccard @@ -10,7 +10,7 @@ if [ "x$apm_enable" = "xYES" ] ; then fi if [ "x$pccard_enable" != "xNO" ] ; then - if [ "x$pccard_mem" != "xNO" ] ; then + if [ "x$pccard_mem" != "xDEFAULT" ] ; then /usr/sbin/pccardc pccardmem $pccard_mem else /usr/sbin/pccardc pccardmem 0xd0000 diff --git a/etc/rc.pccard b/etc/rc.pccard new file mode 100644 index 000000000000..597e89450ef6 --- /dev/null +++ b/etc/rc.pccard @@ -0,0 +1,20 @@ +#!/bin/sh - +# +# PC-card startup script +# HOSOKAWA, Tatsumi +# + +if [ "x$apm_enable" = "xYES" ] ; then + echo "Enable APM BIOS." + /usr/sbin/apmconf -e +fi + +if [ "x$pccard_enable" != "xNO" ] ; then + if [ "x$pccard_mem" != "xDEFAULT" ] ; then + /usr/sbin/pccardc pccardmem $pccard_mem + else + /usr/sbin/pccardc pccardmem 0xd0000 + fi + echo -n "Enable PC-card." + /usr/sbin/pccardd 2>&1 > /var/log/pccardd.debug & +fi diff --git a/etc/sysconfig b/etc/sysconfig index 31fbd734399b..1ea5f0fc671f 100644 --- a/etc/sysconfig +++ b/etc/sysconfig @@ -4,7 +4,7 @@ # This is sysconfig - a file full of useful variables that you can set # to change the default startup behavior of your system. # -# $Id: sysconfig,v 1.40 1996/03/06 03:59:15 jkh Exp $ +# $Id: sysconfig,v 1.41 1996/03/12 15:39:26 nate Exp $ ######################### Start Of Local Configuration Section ########### @@ -212,8 +212,8 @@ apm_enable=NO pccard_enable=NO # If you want to specify the address of memory used by PCIC, -# set this address (NO for default 0xd0000) -pccard_mem=NO +# set this address (DEFAULT=0xd0000) +pccard_mem=DEFAULT # If you want to use Etnerent PCMCIA cards, specify the ifconfig portion # here. (card-specific flags like connector selection should be written in