YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Merge pull request #105 from YunoHost-Apps/fix_dhcp_cleanup

Browse source 
Fix DHCP cleanup
This commit is contained in:
Alexandre Aubin 2023-09-17 21:56:03 +02:00 committed by GitHub
commit 92f06b9e45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
conf/ynh-hotspot
View file

@ -69,13 +69,13 @@ is_forwarding_set() {
is_dhcpd6_running() { is_dhcpd6_running() {
local i=${1} local i=${1}
ps aux | grep "dhcpdv6-ssid${i}" | grep -qv grep [[ -e "/run/dnsmasq/dnsmasq-dhcpdv6-ssid${i}.pid" ]] && ps -p $(cat "/run/dnsmasq/dnsmasq-dhcpdv6-ssid${i}.pid") > /dev/null
} }
is_dhcpd4_running() { is_dhcpd4_running() {
local i=${1} local i=${1}
ps aux | grep "dhcpdv4-ssid${i}" | grep -qv grep [[ -e "/run/dnsmasq/dnsmasq-dhcpdv4-ssid${i}.pid" ]] && ps -p $(cat "/run/dnsmasq/dnsmasq-dhcpdv4-ssid${i}.pid") > /dev/null
} }
is_hostapd_running() { is_hostapd_running() {
@ -154,7 +154,7 @@ start_dhcpd() {
sed "s|__IP4_DNS__|${ip4_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf sed "s|__IP4_DNS__|${ip4_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf
sed "s|__IP4_NAT_PREFIX__|${ip4_nat_prefix[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf sed "s|__IP4_NAT_PREFIX__|${ip4_nat_prefix[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf
dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf -p0 dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf -p0 -x /run/dnsmasq/dnsmasq-dhcpv4-ssid${i}.pid
fi fi
# Run DHCPv6 server # Run DHCPv6 server
@ -167,7 +167,7 @@ start_dhcpd() {
sed "s|__IP6_DNS__|${ip6_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf sed "s|__IP6_DNS__|${ip6_dns[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf
sed "s|__IP6_NET__|${ip6_net[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf sed "s|__IP6_NET__|${ip6_net[${i}]}|g" -i /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf
dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf -p0 dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf -p0 -x /run/dnsmasq/dnsmasq-dhcpv6-ssid${i}.pid
fi fi
} }
@ -244,14 +244,16 @@ stop_dhcpd() {
if is_dhcpd6_running ${i}; then if is_dhcpd6_running ${i}; then
echo "hotspot${i}: Stop the NDP and DHCPv6 server (dnsmasq)" echo "hotspot${i}: Stop the NDP and DHCPv6 server (dnsmasq)"
kill $(ps aux | grep 'dhcpdv6-ssid' | grep -v grep | awk '{ print $2 }') kill $(cat /run/dnsmasq/dnsmasq-dhcpdv6-ssid${i}.pid)
rm -f /etc/dnsmasq.d/dhcpdv6-ssid*.conf rm -f /run/dnsmasq/dnsmasq-dhcpdv6-ssid${1}.pid
rm -f /etc/dnsmasq.dhcpd/dhcpdv6-ssid${i}.conf
fi fi
if is_dhcpd4_running ${i}; then if is_dhcpd4_running ${i}; then
echo "hotspot${i}: Stop the DHCPv4 server (dnsmasq)" echo "hotspot${i}: Stop the DHCPv4 server (dnsmasq)"
kill $(ps aux | grep 'dhcpdv4-ssid' | grep -v grep | awk '{ print $2 }') kill $(cat /run/dnsmasq/dnsmasq-dhcpdv4-ssid${i}.pid)
rm -f /etc/dnsmasq.d/dhcpdv4-ssid*.conf rm -f /run/dnsmasq/dnsmasq-dhcpdv4-ssid${1}.pid
rm -f /etc/dnsmasq.dhcpd/dhcpdv4-ssid${i}.conf
fi fi
} }