diff options
| author | Roy Marples <roy@marples.name> | 2007-12-18 17:59:29 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-12-18 17:59:29 +0000 |
| commit | 437363a3449423173bc94746a122fbf3b4cf254c (patch) | |
| tree | 66653de57209cdebdede01c60eea48996cf373d2 /net | |
| parent | c556731ad317a4a1d02e6ded366ccb0dd2d15806 (diff) | |
| download | openrc-437363a3449423173bc94746a122fbf3b4cf254c.tar.gz openrc-437363a3449423173bc94746a122fbf3b4cf254c.tar.bz2 openrc-437363a3449423173bc94746a122fbf3b4cf254c.tar.xz | |
We no longer need SVCNAME here
Diffstat (limited to 'net')
| -rw-r--r-- | net/wpa_supplicant.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh index 5b24162..a75f04a 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 } |