applications/create_ap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle SIGINT sent by kill

Browse Source
This commit is contained in:
oblique 2014-12-11 21:31:25 +02:00
parent 814ddf9100
commit 48beb35b64
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
create_ap
View File

@ -429,7 +429,11 @@ cleanup() {
for x in $CONFDIR/*.pid; do for x in $CONFDIR/*.pid; do
# even if the $CONFDIR is empty, the for loop will assign # even if the $CONFDIR is empty, the for loop will assign
# a value in $x. so we need to check if the value is a file # a value in $x. so we need to check if the value is a file
[[ -f $x ]] && kill -9 $(cat $x) if [[ -f $x ]]; then
PID=$(cat $x)
disown $PID > /dev/null 2>&1
kill -9 $PID > /dev/null 2>&1
fi
done done
rm -rf $CONFDIR rm -rf $CONFDIR
@ -773,6 +777,8 @@ fi
CONFDIR=$(mktemp -d /tmp/create_ap.${WIFI_IFACE}.conf.XXXXXXXX) CONFDIR=$(mktemp -d /tmp/create_ap.${WIFI_IFACE}.conf.XXXXXXXX)
echo "Config dir: $CONFDIR" echo "Config dir: $CONFDIR"
echo "PID: $$"
echo $$ > $CONFDIR/pid
if [[ $NO_VIRT -eq 0 ]]; then if [[ $NO_VIRT -eq 0 ]]; then
VWIFI_IFACE=$(get_virt_iface_name) VWIFI_IFACE=$(get_virt_iface_name)
@ -1011,7 +1017,11 @@ echo "hostapd command-line interface: hostapd_cli -p $CONFDIR/hostapd_ctrl"
# from now on we exit with 0 on SIGINT # from now on we exit with 0 on SIGINT
trap "clean_exit" SIGINT trap "clean_exit" SIGINT
if ! hostapd $CONFDIR/hostapd.conf; then hostapd $CONFDIR/hostapd.conf &
HOSTAPD_PID=$!
echo $HOSTAPD_PID > $CONFDIR/hostapd.pid
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
if networkmanager_is_running; then if networkmanager_is_running; then
echo "If an error like 'n80211: Could not configure driver mode' was thrown" >&2 echo "If an error like 'n80211: Could not configure driver mode' was thrown" >&2