interesting
/
linux-router
mirror of https://github.com/garywill/linux-router.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix dnsmasq and hostapd pid

This commit is contained in:
garywill 2018-08-31 18:41:06 +08:00 committed by garywill
parent 7815bce574
commit ddb59d3237
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lnxrouter
View File

@ -1592,6 +1592,8 @@ except-interface=*
no-dhcp-interface=lo no-dhcp-interface=lo
dhcp-range=${GATEWAY%.*}.1,${GATEWAY%.*}.254,255.255.255.0,24h dhcp-range=${GATEWAY%.*}.1,${GATEWAY%.*}.254,255.255.255.0,24h
dhcp-option-force=option:router,${GATEWAY} dhcp-option-force=option:router,${GATEWAY}
log-dhcp
log-facility=/dev/stdout
EOF EOF
if [[ "$DHCP_DNS" != "no" ]]; then if [[ "$DHCP_DNS" != "no" ]]; then
if [[ "$DHCP_DNS" == "gateway" ]]; then if [[ "$DHCP_DNS" == "gateway" ]]; then
@ -1614,7 +1616,6 @@ EOF
[[ -n "$ADDN_HOSTS" ]] && echo "addn-hosts=${ADDN_HOSTS}" >> $CONFDIR/dnsmasq.conf [[ -n "$ADDN_HOSTS" ]] && echo "addn-hosts=${ADDN_HOSTS}" >> $CONFDIR/dnsmasq.conf
if [[ ! "$SHOW_DNS_QUERY" -eq 0 ]]; then if [[ ! "$SHOW_DNS_QUERY" -eq 0 ]]; then
echo log-queries=extra >> $CONFDIR/dnsmasq.conf echo log-queries=extra >> $CONFDIR/dnsmasq.conf
echo log-facility=/dev/null >> $CONFDIR/dnsmasq.conf
fi fi
fi fi
@ -1671,7 +1672,13 @@ if [[ $NO_DNSMASQ -eq 0 ]]; then
fi fi
umask 0033 umask 0033
dnsmasq -d -C $CONFDIR/dnsmasq.conf -x $CONFDIR/dnsmasq.pid -l $CONFDIR/dnsmasq.leases -u nobody -g nobody|| die & echo
echo "Starting dnsmasq"
dnsmasq -C $CONFDIR/dnsmasq.conf -x $CONFDIR/dnsmasq.pid -l $CONFDIR/dnsmasq.leases || die &
while [[ ! -f $CONFDIR/dnsmasq.pid ]]; do
sleep 1
echo -n "dnsmasq PID: " ; cat $CONFDIR/dnsmasq.pid
done
umask $SCRIPT_UMASK umask $SCRIPT_UMASK
fi fi
@ -1690,9 +1697,16 @@ if [[ $WIFI_IFACE ]]; then
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
STDBUF_PATH=$STDBUF_PATH" -oL" STDBUF_PATH=$STDBUF_PATH" -oL"
fi fi
$STDBUF_PATH $HOSTAPD $HOSTAPD_DEBUG_ARGS $CONFDIR/hostapd.conf & echo
HOSTAPD_PID=$! echo "Starting hostapd"
echo $HOSTAPD_PID > $CONFDIR/hostapd.pid $STDBUF_PATH hostapd $HOSTAPD_DEBUG_ARGS -B $CONFDIR/hostapd.conf -P $CONFDIR/hostapd.pid || die &
while [[ ! -f $CONFDIR/hostapd.pid ]]; do
sleep 1
echo -n "hostapd PID: " ; cat $CONFDIR/hostapd.pid
done
#HOSTAPD_PID=$!
#echo $HOSTAPD_PID > $CONFDIR/hostapd.pid
if ! wait $HOSTAPD_PID; then if ! wait $HOSTAPD_PID; then
echo -e "\nError: Failed to run hostapd, maybe a program is interfering." >&2 echo -e "\nError: Failed to run hostapd, maybe a program is interfering." >&2