Changed the pcmcia init script name, which required a minor edit to all pcmcia-cs ebuilds.

5 files changed, 3 insertions, 214 deletions

diff --git a/sys-apps/pcmcia-cs/files/pcmcia.conf b/sys-apps/pcmcia-cs/files/pcmcia.conf
index d44aa6f32c08..b43b41065c07 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia.conf
+++ b/sys-apps/pcmcia-cs/files/pcmcia.conf
@@ -5,8 +5,8 @@ SCHEME="home"
 
 # These are from the pcmcia-cs distribution, but aren't used yet
 # Should be either i82365 or tcic
-#PCIC=""
+PCIC=""
 # Put socket driver timing parameters here
-#PCIC_OPTS=""
+PCIC_OPTS=""
 # Put pcmcia_core options here
-#CORE_OPTS=""
+CORE_OPTS=""
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.new b/sys-apps/pcmcia-cs/files/pcmcia.new
deleted file mode 100644
index e1609cd04de8..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia.new
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.new,v 1.2 2001/12/06 20:17:02 azarah Exp $
-
-. /etc/rc.d/config/pcmcia
-
-cleanup()
-{
-    while read SN CLASS MOD INST DEV EXTRA ; do
-        if [ "$SN" != "Socket" ] ; then
-            /etc/pcmcia/$CLASS stop $DEV 2> /dev/null
-        fi
-    done
-}
-
-start() {
-        if [ -d /var/lib/pcmcia ] ; then
-            SC=/var/lib/pcmcia/scheme
-            RUN=/var/lib/pcmcia
-        else
-            SC=/var/run/pcmcia-scheme
-            RUN=/var/run
-        fi
-        if [ -L $SC -o ! -O $SC ] ; then rm -f $SC ; fi
-        if [ ! -f $SC ] ; then umask 022 ; touch $SC ; fi
-        if [ "$SCHEME" ] ; then umask 022 ; echo $SCHEME > $SC ; fi
-        fgrep -q pcmcia /proc/devices
-        if [ $? -ne 0 ] ; then
-            if [ -d /lib/modules/preferred ] ; then
-                PC=/lib/modules/preferred/pcmcia
-            else
-                PC=/lib/modules/`uname -r`/pcmcia
-            fi
-            if [ -d $PC ] ; then
-                echo -n " modules"
-                /sbin/insmod $PC/pcmcia_core.o ${PCMCIA_CORE_OPTS} 2>&1 > /dev/null
-                /sbin/insmod $PC/${PCMCIA_PCIC}.o ${PCMCIA_PCIC_OPTS} 2>&1 > /dev/null
-                /sbin/insmod $PC/ds.o 2>&1 > /dev/null
-            else
-                echo " module directory $PC not found."
-                break
-            fi
-        fi
-        if [ -s /var/run/cardmgr.pid ] && \
-            kill -0 `cat /var/run/cardmgr.pid` 2>/dev/null ; then
-            echo " cardmgr is already running."
-        else
-            if [ -r $RUN/stab ] ; then
-                cat $RUN/stab | cleanup
-            fi
-            /sbin/cardmgr ${PCMCIA_CARDMGR_OPTS} 2>&1 > /dev/null
-        fi
-		mkdir -p /var/lock/subsys
-        touch /var/lock/subsys/pcmcia 2>&1 > /dev/null
-}
-
-stop() {
-        if [ -s /var/run/cardmgr.pid ] ; then
-            PID=`cat /var/run/cardmgr.pid`
-            kill $PID
-            echo -n " cardmgr"
-            # Give cardmgr a few seconds to handle the signal
-            kill -0 $PID 2>/dev/null && sleep 2 && \
-            kill -0 $PID 2>/dev/null && sleep 2 && \
-            kill -0 $PID 2>/dev/null && sleep 2 && \
-            kill -0 $PID 2>/dev/null
-        fi
-        killall -q "CardBus Watcher"
-        if fgrep -q "ds  " /proc/modules ; then
-            echo -n " modules"
-            /sbin/rmmod ds
-            /sbin/rmmod ${PCMCIA_PCIC}
-            /sbin/rmmod pcmcia_core
-        fi
-        rm -f /var/lock/subsys/pcmcia
-}
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.rc6 b/sys-apps/pcmcia-cs/files/pcmcia.rc6
deleted file mode 100644
index 78e10e1fddb2..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia.rc6
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 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.rc6,v 1.6 2002/04/27 23:34:20 bangert Exp $
-
-RUN=/var/run
-SC=${RUN}/pcmcia-scheme
-
-cleanup()
-{
-	while read SN CLASS MOD INST DEV EXTRA ; do
-		if [ "x${SN}" != "xSocket" ] ; then
-			/etc/pcmcia/${CLASS} stop ${DEV} 2> /dev/null
-		fi
-	done
-}
-
-start() {
-   	local modules_loaded
-	local code
-	# Scheme is set for the /etc/pcmcia/shared script
-	if [ -n "${SCHEME}" ] ; then umask 022 ; echo $SCHEME > ${SC}
-	else umask 022 ; touch ${SC}
-	fi
-
-	# clean up any old interfaces
-	if [ -r ${RUN}/stab ] ; then
-		cat ${RUN}/stab | cleanup
-	fi
-	# if /var/lib/pcmcia exists (and sometimes it gets created accidentally if you run
-	#  pcmcia-cs apps w/out the proper flags), then it will really confuse the process
-	if [ -d /var/lib/pcmcia ] ; then
-		rm -rf /var/lib/pcmcia
-	fi
-
-	if [ -z "`fgrep  ds /proc/modules`" ] ; then
-		modules_loaded="0"
-	else 
-		modules_loaded="1"
-	fi
-
-	ebegin "Starting pcmcia"
-	start-stop-daemon --start --quiet --exec /sbin/cardmgr -- -s ${RUN}/stab ${CARDMGR_OPTS}
-	code=$?	
-	if [ $code -gt 0 -a $modules_loaded -eq 0 ] ; then
-		einfo "cardmgr failed to start.  Make sure that you have PCMCIA"
-		einfo "loaded, either as a module or built into the kernel"
-	fi
-	eend $code
-}
-
-stop() {
-	if [ -w ${SC} ] ; then rm -f ${SC} ; fi
-
-	ebegin "Stopping pcmcia"
-	start-stop-daemon --stop --quiet --pidfile /var/run/cardmgr.pid --retry 5
-	eend $?
-}
-
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.rc7 b/sys-apps/pcmcia-cs/files/pcmcia.rc7
deleted file mode 100644
index 0cc0a642d0df..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia.rc7
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2002 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.rc7,v 1.1 2002/09/10 22:22:09 cardoe Exp $
-
-RUN=/var/run
-SC=${RUN}/pcmcia-scheme
-
-depend()
-{
-	use logger
-}
-
-
-cleanup()
-{
-	while read SN CLASS MOD INST DEV EXTRA ; do
-		if [ "x${SN}" != "xSocket" ] ; then
-			/etc/pcmcia/${CLASS} stop ${DEV} 2> /dev/null
-		fi
-	done
-}
-
-start() {
-   	local modules_loaded
-	local code
-	# Scheme is set for the /etc/pcmcia/shared script
-	if [ -n "${SCHEME}" ] ; then umask 022 ; echo $SCHEME > ${SC}
-	else umask 022 ; touch ${SC}
-	fi
-
-	# clean up any old interfaces
-	if [ -r ${RUN}/stab ] ; then
-		cat ${RUN}/stab | cleanup
-	fi
-	# if /var/lib/pcmcia exists (and sometimes it gets created accidentally if you run
-	#  pcmcia-cs apps w/out the proper flags), then it will really confuse the process
-	if [ -d /var/lib/pcmcia ] ; then
-		rm -rf /var/lib/pcmcia
-	fi
-
-	if [ -z "`fgrep  ds /proc/modules`" ] ; then
-		modules_loaded="0"
-	else 
-		modules_loaded="1"
-	fi
-
-	ebegin "Starting pcmcia"
-	start-stop-daemon --start --quiet --exec /sbin/cardmgr -- -s ${RUN}/stab ${CARDMGR_OPTS}
-	code=$?	
-	if [ $code -gt 0 -a $modules_loaded -eq 0 ] ; then
-		einfo "cardmgr failed to start.  Make sure that you have PCMCIA"
-		einfo "loaded, either as a module or built into the kernel"
-	fi
-	eend $code
-}
-
-stop() {
-	if [ -w ${SC} ] ; then rm -f ${SC} ; fi
-
-	ebegin "Stopping pcmcia"
-	start-stop-daemon --stop --quiet --pidfile /var/run/cardmgr.pid --retry 5
-	eend $?
-}
-
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.settings b/sys-apps/pcmcia-cs/files/pcmcia.settings
deleted file mode 100644
index 2d985fe41231..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia.settings
+++ /dev/null
@@ -1,10 +0,0 @@
-# Should be either i82365 or tcic
-PCIC=i82365
-# Put socket driver timing parameters here
-PCIC_OPTS=
-# Put pcmcia_core options here
-CORE_OPTS=
-# Put cardmgr options here
-CARDMGR_OPTS=
-# To set the PCMCIA scheme at startup...
-SCHEME=