--- pcmcia-cs-3.2.7/etc/rc.pcmcia.orig 2005-01-13 14:23:25 +0300 +++ pcmcia-cs-3.2.7/etc/rc.pcmcia 2005-01-13 14:24:23 +0300 @@ -36,6 +36,7 @@ done [ "$PCMCIA" = yes ] || exit 0 +[ ! -d /sys/class ] || KV26=1 LOCKFILE=/var/lock/subsys/pcmcia UPDFSTAB=/usr/sbin/updfstab @@ -83,11 +84,19 @@ (/sbin/modprobe yenta_socket >/dev/null 2>&1 && echo "using yenta_socket instead of $PCIC") || /sbin/modprobe $PCIC $PCIC_OPTS || break - /sbin/modprobe ds || break + if [ $KV26 ]; then + /sbin/modprobe pcmcia || break + else + /sbin/modprobe ds || break + fi elif [ -d $KD ] ; then /sbin/insmod $KD/pcmcia_core.*o $CORE_OPTS /sbin/insmod $KD/$PCIC.*o $PCIC_OPTS - /sbin/insmod $KD/ds.*o + if [ $KV26 ]; then + /sbin/insmod $KD/pcmcia.*o + else + /sbin/insmod $KD/ds.*o + fi else echo "module directory $PC not found." rm -f "$LOCKFILE" @@ -121,11 +130,20 @@ done fi killall -q "CardBus Watcher" - if fgrep -q "ds " /proc/modules ; then - /sbin/rmmod ds - /sbin/rmmod $PCIC 2>/dev/null || \ + if [ $KV26 ]; then + if fgrep -q "pcmcia " /proc/modules ; then + /sbin/rmmod pcmcia + /sbin/rmmod $PCIC 2>/dev/null || \ + /sbin/rmmod yenta_socket 2>/dev/null + /sbin/rmmod pcmcia_core + fi + else + if fgrep -q "ds " /proc/modules ; then + /sbin/rmmod ds + /sbin/rmmod $PCIC 2>/dev/null || \ /sbin/rmmod yenta_socket 2>/dev/null - /sbin/rmmod pcmcia_core + /sbin/rmmod pcmcia_core + fi fi echo "done." rm -f "$LOCKFILE"