Added alternative PCIC module attempt in init script for more flexibility

4 files changed, 39 insertions, 17 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 7b332c3d6227..772428b47606 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.53 2004/02/03 15:54:11 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.54 2004/02/04 22:35:32 latexer Exp $
+
+  04 Feb 2004; Peter Johanson <latexer@gentoo.org> files/pcmcia.conf,
+  files/pcmcia.rc:
+  Added ability to have two different PCIC modules attempted to the init system.
+  This should be useful for liveCDs as well as for people switching between 2.6
+  and 2.4 kernels potentially.
 
   03 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild,
   pcmcia-cs-3.2.5.ebuild:
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index dc6744e5a409..ffc333279d17 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,23 +1,17 @@
 MD5 b3c2629fd0e60f03cbabcb43345d7876 pcmcia-cs-3.2.4.ebuild 4035
-MD5 887db691c9e97c9feb8ff1abd57b892a pcmcia-cs-3.2.7-r1.ebuild 4538
 MD5 42b6034692126c56b1775fdae2c56e45 pcmcia-cs-3.1.34-r8.ebuild 4136
-MD5 ea9b13bc201d8f2fa156249d443cc97f pcmcia-cs-3.2.6.ebuild 4380
-MD5 a5d584dfbd928583715035928f6bebe7 pcmcia-cs-3.2.6-r1.ebuild 4531
 MD5 a367610b5e7afb565bb3d5d73c224c19 pcmcia-cs-3.2.5-r1.ebuild 4861
 MD5 052a01e3c3fdfd19ecaa57d902c4fd49 pcmcia-cs-3.2.5.ebuild 4430
-MD5 a9a3a90ae223680dc365906b8f538e85 pcmcia-cs-3.2.7.ebuild 4538
-MD5 c6b42c5a82dcda5cd12117a20d8f1f82 ChangeLog 12669
+MD5 39b3d1d94b944fac8404da8f93ce6b34 ChangeLog 12951
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 300aadbb4efa9d5933fc0c1fdf004c95 files/digest-pcmcia-cs-3.2.5-r1 233
-MD5 75d50c6e8ed4cfa3d3a9b8532feb922b files/digest-pcmcia-cs-3.2.6-r1 215
-MD5 445043b7ae3483cc97311ca9aaef8f52 files/digest-pcmcia-cs-3.2.7-r1 298
-MD5 398d67e8e892182884b962c8ff2fca2e files/pcmcia.rc 1795
+MD5 da9744cdc1401162cea92b7aded74826 files/pcmcia.rc 2036
 MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652
 MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
 MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
 MD5 8621a69779c0a084e6092f495ac08cde files/gentoo-pcmcia-cs-3.1.34.patch 589
 MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
 MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
-MD5 83977336aa2077a799ca633a6504aabd files/pcmcia.conf 363
+MD5 3046f6b0a3025d78a1ecbefac12484b0 files/pcmcia.conf 549
 MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
 MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.conf b/sys-apps/pcmcia-cs/files/pcmcia.conf
index aca99fea3917..e9913a6df335 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia.conf
+++ b/sys-apps/pcmcia-cs/files/pcmcia.conf
@@ -3,11 +3,17 @@ CARDMGR_OPTS="-f"
 # To set the PCMCIA scheme at startup...
 SCHEME="home"
 
-# These are from the pcmcia-cs distribution, but aren't used yet
-# Should be either i82365 or tcic, Depending on your pcmcia hardware.
+# If using kernel PCMCIA drivers, PCIC should be "yenta_socket". If 
+# using the pcmcia-cs drivers, this shhould be either "i82365" or "tcic",
+# depending on your pcmcia hardware.
+# If using kernel drivers not as modules, set PCIC to ""
 PCIC="i82365"
-#PCIC="tcic"
 # Put socket driver timing parameters here
 PCIC_OPTS=""
+
+# Alternative PCIC driver to use if PCIC driver fails
+PCIC_ALT="yenta_socket"
+PCIC_ALT_OPTS=""
+
 # Put pcmcia_core options here
 CORE_OPTS=""
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.rc b/sys-apps/pcmcia-cs/files/pcmcia.rc
index 703c8e9d060b..5078225e15ba 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia.rc
+++ b/sys-apps/pcmcia-cs/files/pcmcia.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.rc,v 1.4 2003/06/08 13:39:17 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.rc,v 1.5 2004/02/04 22:35:33 latexer Exp $
 
 RUN=/var/run
 SC=${RUN}/pcmcia-scheme
@@ -15,6 +15,16 @@ cleanup()
 	done
 }
 
+pcmcia_probe()
+{
+	MODULE=$1
+	OPTS=$2
+
+	/sbin/modprobe $MODULE $OPTS 2>/dev/null
+
+	return $?
+}
+
 start() {
 	local code
 	# Scheme is set for the /etc/pcmcia/shared script
@@ -34,9 +44,15 @@ start() {
 	fi
 
 	if [ -z `fgrep "ds " /proc/modules | head -n1 | cut -c1` ] ; then
-		/sbin/modprobe pcmcia_core $CORE_OPTS 2> /dev/null
-		/sbin/modprobe $PCIC $PCIC_OPTS 2> /dev/null
-		/sbin/modprobe ds
+		pcmcia_probe pcmcia_core $CORE_OPTS
+		if [ -n "$PCIC" ]; then
+			pcmcia_probe $PCIC $PCIC_OPTS || {
+				ewarn "'modprobe ${PCIC}' failed"
+				ewarn "Trying alternative PCIC driver: ${PCIC_ALT}"
+				pcmcia_probe $PCIC_ALT $PCIC_ALT_OPTS
+			}
+		fi
+		pcmcia_probe ds
 	fi
 
 	ebegin "Starting pcmcia"