From 4216ad7e3cc4d4733034a50c122e4efa4ae08108 Mon Sep 17 00:00:00 2001
From: Silvino Silva <silvino@bk.ru>
Date: Fri, 13 Mar 2020 19:34:51 +0000
Subject: openssh and core rc.d/wan update

---
 core/conf/rc.d/wlan | 45 ++++++++-------------------------------------
 1 file changed, 8 insertions(+), 37 deletions(-)

(limited to 'core/conf')

diff --git a/core/conf/rc.d/wlan b/core/conf/rc.d/wlan
index c9c60ec..9a2f935 100755
--- a/core/conf/rc.d/wlan
+++ b/core/conf/rc.d/wlan
@@ -3,11 +3,8 @@
 # /etc/rc.d/wlan: start/stop wireless interface
 #
 
-# Connection type: "DHCP" or "static"
-#TYPE="DHCP"
-TYPE="static"
+DEV=wlp3s0
 
-DEV=wlp7s0
 
 SSD=/sbin/start-stop-daemon
 PROG_DHCP=/sbin/dhcpcd
@@ -18,10 +15,6 @@ PID_WIFI=/var/run/wpa_supplicant.pid
 OPTS_DHCP="--waitip -h $(/bin/hostname) -z $DEV"
 OPTS_WIFI="-B -P $PID_WIFI -D nl80211,wext -c /etc/wpa_supplicant.conf -i $DEV"
 
-ADDR=192.168.1.67
-MASK=24
-GW=192.168.1.254
-
 
 print_status() {
 	$SSD --status --pidfile $2
@@ -35,37 +28,14 @@ print_status() {
 
 case $1 in
 	start)
-
-		if [ "${TYPE}" = "DHCP" ]; then
-			$SSD --start --pidfile $PID_WIFI --exec $PROG_WIFI -- $OPTS_WIFI && \
-			$SSD --start --pidfile $PID_DHCP --exec $PROG_DHCP -- $OPTS_DHCP
-			RETVAL=$?
-		else
-
-			/sbin/ip link set ${DEV} up
-
-			$SSD --start --pidfile $PID_WIFI --exec $PROG_WIFI -- $OPTS_WIFI 
-
-			RETVAL=$?
-
-			/sbin/ip addr add ${ADDR}/${MASK} dev ${DEV} broadcast +
-			/sbin/ip route add default via ${GW}
-		fi
+		$SSD --start --pidfile $PID_WIFI --exec $PROG_WIFI -- $OPTS_WIFI && \
+		$SSD --start --pidfile $PID_DHCP --exec $PROG_DHCP -- $OPTS_DHCP
+		RETVAL=$?
 		;;
 	stop)
-
-		if [ "${TYPE}" = "DHCP" ]; then
-			( $SSD --stop --retry 10 --pidfile $PID_DHCP 
-			  $SSD --stop --retry 10 --pidfile $PID_WIFI )
-			RETVAL=$?
-		else
-			$SSD --stop --retry 10 --pidfile $PID_WIFI 
-			RETVAL=$?
-
-			/sbin/ip link set ${DEV} down
-			/sbin/ip route del default
-			/sbin/ip addr del ${ADDR}/${MASK} dev ${DEV}
-		fi
+		( $SSD --stop --retry 10 --pidfile $PID_DHCP 
+		  $SSD --stop --retry 10 --pidfile $PID_WIFI )
+		RETVAL=$?
 		;;
 	restart)
 		$0 stop
@@ -83,3 +53,4 @@ esac
 exit $RETVAL
 
 # End of file
+
-- 
cgit 1.4.1-2-gfad0