View | Details | Raw Unified
Collapse All | Expand All

(-)pcmcia-cs-3.2.7/etc/rc.pcmcia.orig (-6 / +24 lines)
 Lines 36-41    Link Here 
36
done
36
done
37
37
38
[ "$PCMCIA" = yes ] || exit 0
38
[ "$PCMCIA" = yes ] || exit 0
39
[ ! -d /sys/class ] || KV26=1
39
40
40
LOCKFILE=/var/lock/subsys/pcmcia
41
LOCKFILE=/var/lock/subsys/pcmcia
41
UPDFSTAB=/usr/sbin/updfstab
42
UPDFSTAB=/usr/sbin/updfstab
 Lines 83-93    Link Here 
83
		  (/sbin/modprobe yenta_socket >/dev/null 2>&1 &&
84
		  (/sbin/modprobe yenta_socket >/dev/null 2>&1 &&
84
		   echo "using yenta_socket instead of $PCIC") ||
85
		   echo "using yenta_socket instead of $PCIC") ||
85
		  /sbin/modprobe $PCIC $PCIC_OPTS || break
86
		  /sbin/modprobe $PCIC $PCIC_OPTS || break
86
		/sbin/modprobe ds || break
87
		if [ $KV26 ]; then
88
		    /sbin/modprobe pcmcia || break
89
		else
90
		    /sbin/modprobe ds || break
91
		fi
87
	    elif [ -d $KD ] ; then
92
	    elif [ -d $KD ] ; then
88
		/sbin/insmod $KD/pcmcia_core.*o $CORE_OPTS
93
		/sbin/insmod $KD/pcmcia_core.*o $CORE_OPTS
89
		/sbin/insmod $KD/$PCIC.*o $PCIC_OPTS
94
		/sbin/insmod $KD/$PCIC.*o $PCIC_OPTS
90
		/sbin/insmod $KD/ds.*o
95
		if [ $KV26 ]; then
96
		    /sbin/insmod $KD/pcmcia.*o
97
		else
98
		    /sbin/insmod $KD/ds.*o
99
		fi
91
	    else
100
	    else
92
		echo "module directory $PC not found."
101
		echo "module directory $PC not found."
93
		rm -f "$LOCKFILE"
102
		rm -f "$LOCKFILE"
 Lines 121-131    Link Here 
121
	    done
130
	    done
122
	fi
131
	fi
123
	killall -q "CardBus Watcher"
132
	killall -q "CardBus Watcher"
124
	if fgrep -q "ds  " /proc/modules ; then
133
	if [ $KV26 ]; then
125
	    /sbin/rmmod ds
134
	    if fgrep -q "pcmcia " /proc/modules ; then
126
	    /sbin/rmmod $PCIC 2>/dev/null || \
135
		/sbin/rmmod pcmcia
136
		/sbin/rmmod $PCIC 2>/dev/null || \
137
		/sbin/rmmod yenta_socket 2>/dev/null
138
		/sbin/rmmod pcmcia_core
139
	    fi
140
	else
141
	    if fgrep -q "ds  " /proc/modules ; then
142
		/sbin/rmmod ds
143
		/sbin/rmmod $PCIC 2>/dev/null || \
127
		/sbin/rmmod yenta_socket 2>/dev/null
144
		/sbin/rmmod yenta_socket 2>/dev/null
128
	    /sbin/rmmod pcmcia_core
145
		/sbin/rmmod pcmcia_core
146
	    fi
129
	fi
147
	fi
130
	echo "done."
148
	echo "done."
131
	rm -f "$LOCKFILE"
149
	rm -f "$LOCKFILE"