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 | a06de1d8c9bcc5a90844f347047ae2e3abb795f6 (patch) | |
| tree | 2bddd6790769065247e733766707c88b3f37d9c5 /sys-apps | |
| parent | Removed postrm. (Manifest recommit) (diff) | |
| download | gentoo-2-a06de1d8c9bcc5a90844f347047ae2e3abb795f6.tar.gz gentoo-2-a06de1d8c9bcc5a90844f347047ae2e3abb795f6.tar.bz2 gentoo-2-a06de1d8c9bcc5a90844f347047ae2e3abb795f6.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/files/pcmcia.rc | 8 |
2 files changed, 11 insertions, 4 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/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}" |