Merge in all the changes that Mike Makonnen has been maintaining for a

while. This is only the script pieces, the glue for the build comes next.

Submitted by:   Mike Makonnen <makonnen@pacbell.net>
Reviewed by:    silence on -current and -hackers
Prodded by:     rwatson

1 files changed, 34 insertions, 22 deletions

diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 9152e82..92e052c 100644
--- a/etc/rc.d/pccard
+++ b/etc/rc.d/pccard
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/sh
 #
 # Copyright (c) 1996  The FreeBSD Project
 # All rights reserved.
@@ -27,30 +27,42 @@
 # $FreeBSD$
 #
 
-#	PC-card startup script
+# PROVIDE: pccard
+# REQUIRE: mountcritlocal
+# KEYWORD: FreeBSD
 
-case ${pccard_enable} in
-[Yy][Ee][Ss])
-	echo -n 'Setup PC-CARD:'
+. /etc/rc.subr
 
-	case ${pccard_mem} in
-	[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-		pccardc pccardmem 0xd0000 1>/dev/null && echo -n ' memory'
-		;;
-	*)
-		pccardc pccardmem ${pccard_mem} 1>/dev/null && echo -n ' memory'
-		;;
-	esac
+name="pccard"
+start_cmd="pccard_start"
+stop_cmd=":"
 
-	if [ -n "${pccard_beep}" ] ; then
-		pccardc beep ${pccard_beep} && echo -n ' beep'
-	fi
+pccard_start()
+{
+	if checkyesno pccard_enable ; then
+		echo -n 'Setup PC-CARD:'
+
+		case ${pccard_mem} in
+		[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
+			pccardc pccardmem 0xd0000 1>/dev/null && echo -n ' memory'
+			;;
+		*)
+			pccardc pccardmem ${pccard_mem} 1>/dev/null && echo -n ' memory'
+			;;
+		esac
+
+		if [ -n "${pccard_beep}" ] ; then
+			pccardc beep ${pccard_beep} && echo -n ' beep'
+		fi
+
+		if [ -n "${pccard_conf}" ]; then
+			pccardd_flags="${pccardd_flags} -f ${pccard_conf}"
+		fi
 
-	if [ -n "${pccard_conf}" ]; then
-		pccardd_flags="${pccardd_flags} -f ${pccard_conf}"
+		pccardd ${pccardd_flags} && echo -n ' pccardd'
+		echo '.'
 	fi
+}
 
-	pccardd ${pccardd_flags} && echo -n ' pccardd'
-	echo '.'
-	;;
-esac
+load_rc_config $name
+run_rc_command "$1"