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

fix start dhcp

Browse source
This commit is contained in:
HgO 2023-08-21 19:35:38 +02:00
parent 4bbf247394
commit 5d8ea57e2a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
conf/ynh-hotspot
View file

@ -55,11 +55,11 @@ is_forwarding_set() {
} }
is_dhcpd6_running() { is_dhcpd6_running() {
[[ -e "/run/dnsmasq/dnsmasq-dhcpdv6-ssid-${wifi_device}.pid" ]] && ps -p $(cat "/run/dnsmasq/dnsmasq-dhcpdv6-ssid-${wifi_device}.pid") > /dev/null [[ -e "/run/dnsmasq/dnsmasq-dhcpdv6-$app.pid" ]] && ps -p $(cat "/run/dnsmasq/dnsmasq-dhcpdv6-$app.pid") > /dev/null
} }
is_dhcpd4_running() { is_dhcpd4_running() {
[[ -e "/run/dnsmasq/dnsmasq-dhcpdv4-ssid-${wifi_device}.pid" ]] && ps -p $(cat "/run/dnsmasq/dnsmasq-dhcpdv4-ssid-${wifi_device}.pid") > /dev/null [[ -e "/run/dnsmasq/dnsmasq-dhcpdv4-$app.pid" ]] && ps -p $(cat "/run/dnsmasq/dnsmasq-dhcpdv4-$app.pid") > /dev/null
} }
is_hostapd_running() { is_hostapd_running() {
@ -148,13 +148,13 @@ start_dhcpd() {
# Run DHCPv4 server # Run DHCPv4 server
if ! is_dhcpd4_running; then if ! is_dhcpd4_running; then
echo "hotspot ${wifi_device}: Start the DHCPv4 server (dnsmasq)" echo "hotspot ${wifi_device}: Start the DHCPv4 server (dnsmasq)"
dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv4-ssid-${wifi_device}.conf -p0 -x /run/dnsmasq/dnsmasq-dhcpv4-ssid-${wifi_device}.pid dnsmasq -C /etc/dnsmasq.$app/dhcpdv4.conf -p0 -x /run/dnsmasq/dnsmasq-dhcpv4-$app.pid
fi fi
# Run DHCPv6 server # Run DHCPv6 server
if has_ip6delegatedprefix && ! is_dhcpd6_running; then if has_ip6delegatedprefix && ! is_dhcpd6_running; then
echo "hotspot ${wifi_device}: Start the NDP and DHCPv6 server (dnsmasq)" echo "hotspot ${wifi_device}: Start the NDP and DHCPv6 server (dnsmasq)"
dnsmasq -C /etc/dnsmasq.dhcpd/dhcpdv6-ssid-${wifi_device}.conf -p0 -x /run/dnsmasq/dnsmasq-dhcpv6-ssid-${wifi_device}.pid dnsmasq -C /etc/dnsmasq.$app/dhcpdv6.conf -p0 -x /run/dnsmasq/dnsmasq-dhcpv6-$app.pid
fi fi
} }
@ -200,14 +200,14 @@ unset_forwarding() {
stop_dhcpd() { stop_dhcpd() {
if is_dhcpd6_running; then if is_dhcpd6_running; then
echo "hotspot ${wifi_device}: Stop the NDP and DHCPv6 server (dnsmasq)" echo "hotspot ${wifi_device}: Stop the NDP and DHCPv6 server (dnsmasq)"
kill $(cat /run/dnsmasq/dnsmasq-dhcpdv6-ssid-${wifi_device}.pid) kill $(cat /run/dnsmasq/dnsmasq-dhcpdv6-$app.pid)
rm -f /run/dnsmasq/dnsmasq-dhcpdv6-ssid-${wifi_device}.pid rm -f /run/dnsmasq/dnsmasq-dhcpdv6-$app.pid
fi fi
if is_dhcpd4_running; then if is_dhcpd4_running; then
echo "hotspot ${wifi_device}: Stop the DHCPv4 server (dnsmasq)" echo "hotspot ${wifi_device}: Stop the DHCPv4 server (dnsmasq)"
kill $(cat /run/dnsmasq/dnsmasq-dhcpdv4-ssid-${wifi_device}.pid) kill $(cat /run/dnsmasq/dnsmasq-dhcpdv4-$app.pid)
rm -f /run/dnsmasq/dnsmasq-dhcpdv4-ssid-${wifi_device}.pid rm -f /run/dnsmasq/dnsmasq-dhcpdv4-$app.pid
fi fi
} }