From 437363a3449423173bc94746a122fbf3b4cf254c Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 18 Dec 2007 17:59:29 +0000
Subject: [PATCH] We no longer need SVCNAME here

---
 net.Linux/ifplugd.sh  | 4 ++--
 net.Linux/netplugd.sh | 4 ++--
 net.Linux/pppd.sh     | 4 ++--
 net/wpa_supplicant.sh | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net.Linux/ifplugd.sh b/net.Linux/ifplugd.sh
index f6e3260d..e4600b75 100644
--- a/net.Linux/ifplugd.sh
+++ b/net.Linux/ifplugd.sh
@@ -61,7 +61,7 @@ ifplugd_pre_start() {
 	eval args=\$ifplugd_${IFVAR}
 
 	# Mark the us as inactive so netplug can restart us
-	mark_service_inactive "${SVCNAME}"
+	mark_service_inactive
 
 	# Start ifplugd
 	eval start-stop-daemon --start --exec /usr/sbin/ifplugd \
@@ -83,7 +83,7 @@ ifplugd_pre_start() {
 
 	local i=0
 	while true; do
-		if service_started "${SVCNAME}"; then
+		if service_started; then
 			_show_address
 			exit 0
 		fi
diff --git a/net.Linux/netplugd.sh b/net.Linux/netplugd.sh
index 0be5e938..24539b14 100644
--- a/net.Linux/netplugd.sh
+++ b/net.Linux/netplugd.sh
@@ -62,7 +62,7 @@ netplugd_pre_start() {
 	ebegin "Starting netplug on" "${IFACE}"
 
 	# Mark the us as inactive so netplug can restart us
-	mark_service_inactive "${SVCNAME}"
+	mark_service_inactive
 
 	# Start netplug
 	start-stop-daemon --start --exec /sbin/netplugd \
@@ -85,7 +85,7 @@ netplugd_pre_start() {
 
 	local i=0
 	while true; do
-		if service_started "${SVCNAME}"; then
+		if service_started; then
 			_show_address
 			exit 0
 		fi
diff --git a/net.Linux/pppd.sh b/net.Linux/pppd.sh
index d5db153c..510a63a7 100644
--- a/net.Linux/pppd.sh
+++ b/net.Linux/pppd.sh
@@ -213,7 +213,7 @@ pppd_pre_start() {
 	[ "${insert_link_in_opts}" = "0" ] || opts="${link} ${opts}"
 
 	ebegin "Starting pppd in ${IFACE}"
-	mark_service_inactive "${SVCNAME}"
+	mark_service_inactive
 	if [ -n "${username}" ] \
 	&& [ -n "${password}" -o -z "${passwordset}" ]; then
 		printf "%s" "${password}" | \
@@ -225,7 +225,7 @@ pppd_pre_start() {
 	fi
 
 	if ! eend $? "Failed to start PPP"; then
-		mark_service_stopped "net.${IFACE}"
+		mark_service_stopped
 		return 1
 	fi
 
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index 5b241629..a75f04a5 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -142,7 +142,7 @@ wpa_supplicant_pre_start() {
 		opts="${opts} -W"
 	else
 		sleep 2 # FBSD 7.0 beta2 bug
-		mark_service_inactive "${SVCNAME}"
+		mark_service_inactive
 	fi
 	start-stop-daemon --start --exec "${wpas}" \
 		--pidfile "/var/run/wpa_supplicant-${IFACE}.pid" \
@@ -157,8 +157,8 @@ wpa_supplicant_pre_start() {
 	# Starting wpa_supplication-0.4.0, we can get wpa_cli to
 	# start/stop our scripts from wpa_supplicant messages
 	local inact=false
-	service_inactive "${SVCNAME}" && inact=true
-	mark_service_inactive "${SVCNAME}"
+	service_inactive && inact=true
+	mark_service_inactive
 
 	ebegin "Starting wpa_cli on" "${IFACE}"
 	start-stop-daemon --start --exec "${wpac}" \
@@ -173,7 +173,7 @@ wpa_supplicant_pre_start() {
 	# wpa_cli failed to start? OK, error here
 	start-stop-daemon --quiet --stop --exec "${wpas}" \
 		--pidfile "/var/run/wpa_supplicant-${IFACE}.pid"
-	${inact} ||	mark_service_stopped "${SVCNAME}"
+	${inact} ||	mark_service_stopped
 	return 1
 }