diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2004-03-19 03:21:25 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2004-03-19 03:21:25 +0000 |
| commit | e8c99bbb08de641baa638d88a15a98c7b7de9e32 (patch) | |
| tree | e311f2a87cc456f89aa00222e83f92253b58ead6 /sys-apps | |
| parent | Removed postrm. (diff) | |
| download | historical-e8c99bbb08de641baa638d88a15a98c7b7de9e32.tar.gz historical-e8c99bbb08de641baa638d88a15a98c7b7de9e32.tar.bz2 historical-e8c99bbb08de641baa638d88a15a98c7b7de9e32.zip | |
Small fix to check for pcmcia already being present before probing things. Thanks to Scott Taylor in bug #43213
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/pcmcia-cs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/pcmcia-cs/files/pcmcia.rc | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog index b2a09633ea56..39314224df03 100644 --- a/sys-apps/pcmcia-cs/ChangeLog +++ b/sys-apps/pcmcia-cs/ChangeLog @@ -1,6 +1,11 @@ # 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.64 2004/03/01 19:59:51 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.65 2004/03/19 03:21:25 latexer Exp $ + + 18 Mar 2004; Peter Johanson <latexer@gentoo.org> files/pcmcia.rc: + Added a slightly smarter check for pcmcia present in the kernel before + attempting to modprobe things. Thanks to Scott Taylor <swtaylor@gentoo.org> + for the suggestion. 18 Feb 2004; Brad House <brad_mssw@gentoo.org> pcmcia-cs-3.2.7.ebuild: amd64 stable diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest index 87321fa3895b..b59bc3804533 100644 --- a/sys-apps/pcmcia-cs/Manifest +++ b/sys-apps/pcmcia-cs/Manifest @@ -3,10 +3,10 @@ MD5 42b6034692126c56b1775fdae2c56e45 pcmcia-cs-3.1.34-r8.ebuild 4136 MD5 3765a9e673b1521d0fe82f0cdc8b34e6 pcmcia-cs-3.2.5-r1.ebuild 5262 MD5 052a01e3c3fdfd19ecaa57d902c4fd49 pcmcia-cs-3.2.5.ebuild 4430 MD5 063db3ab012b6ad2b00cbf5316c65c68 pcmcia-cs-3.2.7.ebuild 4758 -MD5 85973277d76e5cc4b8b63e18ff86e653 ChangeLog 14304 +MD5 1c2d27c34148d7d9ddfe59033793669f ChangeLog 14549 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159 MD5 157ac5bc22e938e1c2268c1f2610420c files/digest-pcmcia-cs-3.2.5-r1 379 -MD5 da9744cdc1401162cea92b7aded74826 files/pcmcia.rc 2036 +MD5 3cb3bb5c9d510b4d6425ab9b311ff975 files/pcmcia.rc 2046 MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652 MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150 MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7 287 diff --git a/sys-apps/pcmcia-cs/files/pcmcia.rc b/sys-apps/pcmcia-cs/files/pcmcia.rc index 5078225e15ba..29f604ee1635 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.5 2004/02/04 22:35:33 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.rc,v 1.6 2004/03/19 03:21:25 latexer Exp $ RUN=/var/run SC=${RUN}/pcmcia-scheme @@ -43,9 +43,11 @@ start() { rm -rf /var/lib/pcmcia fi - if [ -z `fgrep "ds " /proc/modules | head -n1 | cut -c1` ] ; then + if [ -e /proc/bus/pccard ]; then + einfo "PCMCIA support detected." + else pcmcia_probe pcmcia_core $CORE_OPTS - if [ -n "$PCIC" ]; then + if [ -n "${PCIC}" ]; then pcmcia_probe $PCIC $PCIC_OPTS || { ewarn "'modprobe ${PCIC}' failed" ewarn "Trying alternative PCIC driver: ${PCIC_ALT}" |