Init fix. bug #22396

3 files changed, 25 insertions, 22 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index efe4b6ac7c84..b08632509307 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.42 2003/04/14 19:39:20 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.43 2003/06/08 13:39:17 latexer Exp $
+
+  08 Jun 2003; Peter Johanson <latexer@gentoo.org> files/pcmcia.rc:
+  Little fix to pcmcia init script. bug #22396
 
 *pcmcia-cs-3.2.4 (15 Apr 2003)
 
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 24e514951529..2ee457aba528 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,32 +1,32 @@
-MD5 1a6f50df9c6d5c6cbb037b44a708936d ChangeLog 10879
+MD5 bcfcc38da06dee33f30076d749e10de5 pcmcia-cs-3.2.4.ebuild 4033
 MD5 8d94e68fe2f30006e390fcb40f458b5f pcmcia-cs-3.1.34-r8.ebuild 4136
-MD5 5f0d18aabeb69de4b1db737d6889a00d pcmcia-cs-3.2.0.ebuild 4080
-MD5 d5b73b3cdd7db4d8b0e4f6e53f4b5cd3 pcmcia-cs-3.2.1-r1.ebuild 4360
+MD5 c25832b3c339e2e51228e569545cbc52 pcmcia-cs-3.2.3-r1.ebuild 4713
+MD5 f9c45b92ff6718da49cb5ad158c50eda pcmcia-cs-3.2.1.ebuild 4080
 MD5 64512ac32bb1920d0767dd1aa0d3986a pcmcia-cs-3.2.1-r2.ebuild 4546
-MD5 b62ee09d611c02f78f0616bf2620497c pcmcia-cs-3.2.1-r3.ebuild 4486
+MD5 598c63bc144db9f510f6c90c45f6043d pcmcia-cs-3.2.3.ebuild 3895
 MD5 68987a8e53fa8565d634211ebd1eb30e pcmcia-cs-3.2.1-r4.ebuild 4640
-MD5 f9c45b92ff6718da49cb5ad158c50eda pcmcia-cs-3.2.1.ebuild 4080
-MD5 73eadf67309aba102e2151dee63c3fde pcmcia-cs-3.2.2.ebuild 4544
-MD5 c25832b3c339e2e51228e569545cbc52 pcmcia-cs-3.2.3-r1.ebuild 4713
+MD5 5f0d18aabeb69de4b1db737d6889a00d pcmcia-cs-3.2.0.ebuild 4080
+MD5 d5b73b3cdd7db4d8b0e4f6e53f4b5cd3 pcmcia-cs-3.2.1-r1.ebuild 4360
 MD5 2c33a93dfe90d44d05c44d86ce72adf2 pcmcia-cs-3.2.3-r2.ebuild 4631
-MD5 598c63bc144db9f510f6c90c45f6043d pcmcia-cs-3.2.3.ebuild 3895
-MD5 bcfcc38da06dee33f30076d749e10de5 pcmcia-cs-3.2.4.ebuild 4033
-MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
-MD5 645c48ec1ab21e1ff5abd7c3da0e6c49 files/digest-pcmcia-cs-3.2.0 132
-MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1 132
+MD5 e171da377b5a6f77ff74c0f5b2183bcf ChangeLog 10995
+MD5 73eadf67309aba102e2151dee63c3fde pcmcia-cs-3.2.2.ebuild 4544
+MD5 b62ee09d611c02f78f0616bf2620497c pcmcia-cs-3.2.1-r3.ebuild 4486
 MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1-r1 132
 MD5 d6511afd8683d5f7bfd4a3f4b5d92fa0 files/digest-pcmcia-cs-3.2.1-r2 210
 MD5 f83cae6f8b822bdde4ed6e0018b222f4 files/digest-pcmcia-cs-3.2.1-r3 200
 MD5 be9bc60b3b2c6dee9e06cff4ba860255 files/digest-pcmcia-cs-3.2.1-r4 202
-MD5 ad2ff65ddeee3b4191866e70ddc75005 files/digest-pcmcia-cs-3.2.2 210
-MD5 166988c95effd8177790227bd751ccf5 files/digest-pcmcia-cs-3.2.3 132
 MD5 cab820e565fbda87760dbb0aa7ed968e files/digest-pcmcia-cs-3.2.3-r1 264
 MD5 961919138ced08c289989b20bdc22038 files/digest-pcmcia-cs-3.2.3-r2 202
+MD5 398d67e8e892182884b962c8ff2fca2e files/pcmcia.rc 1795
+MD5 645c48ec1ab21e1ff5abd7c3da0e6c49 files/digest-pcmcia-cs-3.2.0 132
+MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1 132
+MD5 ad2ff65ddeee3b4191866e70ddc75005 files/digest-pcmcia-cs-3.2.2 210
+MD5 166988c95effd8177790227bd751ccf5 files/digest-pcmcia-cs-3.2.3 132
 MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652
+MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
 MD5 8621a69779c0a084e6092f495ac08cde files/gentoo-pcmcia-cs-3.1.34.patch 589
-MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
 MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
-MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
-MD5 a43f37f4881d16127f80036564a528b2 files/pcmcia.conf 319
-MD5 322bba007f530d2f580a81a284142430 files/pcmcia.rc 1792
 MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
+MD5 a43f37f4881d16127f80036564a528b2 files/pcmcia.conf 319
+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.rc b/sys-apps/pcmcia-cs/files/pcmcia.rc
index 83756aab750f..703c8e9d060b 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.3 2003/02/14 23:26:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.rc,v 1.4 2003/06/08 13:39:17 latexer Exp $
 
 RUN=/var/run
 SC=${RUN}/pcmcia-scheme
@@ -33,7 +33,7 @@ start() {
 		rm -rf /var/lib/pcmcia
 	fi
 
-	if [ -z `fgrep "ds " /proc/modules | head -1 | cut -c1` ] ; then
+	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
@@ -58,7 +58,7 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/cardmgr.pid --retry 5
 	code=$?	
 
-	if [ -n `fgrep "ds " /proc/modules | head -1 | cut -c1` ]; then
+	if [ -n `fgrep "ds " /proc/modules | head -n1 | cut -c1` ]; then
 		/sbin/rmmod ds 2> /dev/null
 		/sbin/rmmod $PCIC 2> /dev/null
 		/sbin/rmmod pcmcia_core 2> /dev/null