svc

чување 460bed6e5c1b9fd7111390befa6fd7de41f2b3cf
родитељ 1cdd34d59aa1974c6309d4137e4a3826d33ae69a
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu,  4 May 2023 15:35:37 +0200

Fix wpa_supplicant + sdhcp: remove -B

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
svc.d/avail/sdhcp
 | 
24
++++++++++++------------
M
svc.d/avail/wpa_supplicant
 | 
25
++++++-------------------

измењених датотека: 2, додавања: 18(+), брисања: 31(-)
diff --git a/svc.d/avail/sdhcp b/svc.d/avail/sdhcp
@@ -5,18 +5,18 @@ svcbin=/bin/sdhcp
 
 . /bin/svc.d/default/${svc}
 
-logger -it sdhcp "Called with arguments: {$@}"
-if [ "$1" = "wlan0" ]; then
-	case $2 in
-		CONNECTED)
-			#${svcbin} ${PARAMS} >/dev/null 2>&1 &
-			${svcbin} ${PARAMS} &
-			exit 0;;
-		DISCONNECTED)
-			exit 0;;
-		*)	;;
-	esac
-fi
+case $2 in
+	CONNECTED)
+		logger -it sdhcp "From wpa_cli: called with arguments: {$@}"
+		logger -it sdhcp "WPA_CTRL_DIR={${WPA_CTRL_DIR}}, WPA_ID={${WPA_ID}}, \
+WPA_ID_STR={${WPA_ID_STR}}"
+		${svcbin} $1 >/dev/null 2>&1 &
+		exit 0;;
+	DISCONNECTED)
+		exit 0;;
+	*)	;; # FALLTHROUGH
+esac
+
 PID=$(pgrep -f ${svcbin})
 case $1 in
 	-e)	if [ -z "${FROMSELF}" ] && [ "${IFACE}" = "wlan0" ]; then
diff --git a/svc.d/avail/wpa_supplicant b/svc.d/avail/wpa_supplicant
@@ -16,22 +16,12 @@ case $1 in
 		fi;;
 	-s)	$0 -e
 		case $? in
-			0)	return 1;;
+			0)	exit 1;;
 			2)	
 				logger -it wpa_supplicant "Executing ${svcbin} ${PARAMS}"
 				${svcbin} ${PARAMS} >/dev/null 2>&1 &
-# 				if [ -n "${RUNDIR}" ] && [ -n "${PIDFILE}" ] \
-# 					&& [ ! -e "${PIDFILE}" ]
-# 				then
-# 					while [ ! -e "${PIDFILE}" ]; do
-# 						/bin/usleep  ${PIDLOOPDELAY}
-# 					done
-# 				elif [ -n "${STARTDELAY}" ]; then
-# 					/bin/usleep "${STARTDELAY}"
-# 				fi
 				$0 -e
 				errno=$?
-				# logger -it wpa_supplicant "Executing $0 -e (errno: $errno)"
 				if [ -n "${RUNDIR}" ]; then
 					case $errno in
 					0) :> "${RUNDIR}/${SERVICE}.up";;
@@ -39,18 +29,15 @@ case $1 in
 						2>/dev/null;;
 					esac
 				fi
-# 				logger -it wpa_supplicant "Executing ${wpa_cli} -i ${IFACE} -a ${0%/*}/sdhcp -B"
-# 				logger -it wpa_supplicant "Exists ${0%/*}/sdhcp? $(if [ -e ${0%/*}/sdhcp ]; then echo yes; else echo no; fi)"
-				logger -it wpa_supplicant "Executing ${0%/*}/sdhcp ${IFACE} CONNECTED"
-				${0%/*}/sdhcp "${IFACE}" CONNECTED
 				# Run sdhcp when connected; not reliable in my testing
-				#${wpa_cli} -i "${IFACE}" -a ${0%/*}/sdhcp -B
+				logger -it wpa_supplicant "Executing ${wpa_cli} -i ${IFACE} -a ${0%/*}/sdhcp"
+				${wpa_cli} -i "${IFACE}" -a ${0%/*}/sdhcp
 				;;
-			*)	return $?;;
+			*)	exit $?;;
 		esac;;
 	-k)	$0 -e
 		case $? in
-			2)	return 1;;
+			2)	exit 1;;
 			0)	pkill -f "${svcbin}" >/dev/null 2>&1
 				pkill -f ${wpa_cli} -i "${IFACE}" >/dev/null 2>&1
 				if [ -n "$(pgrep -f "${svcbin}" 2>/dev/null)" ]
@@ -68,7 +55,7 @@ case $1 in
 				if [ -n "${RUNDIR}" ]; then
 					rm "${RUNDIR}/${SERVICE}.up"
 				fi;;
-			*)	return $?;;
+			*)	exit $?;;
 		esac;;
 	-r)	$0 -k
 		$0 -s;;