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

Merge branch 'hashken-hostapd_bug'

Browse Source
This commit is contained in:
oblique
2014-08-17 01:16:50 +03:00
parent 9ab97af451 d9284c3d6b
commit 4758bcf6d9
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
create_ap
View File

@ -101,14 +101,17 @@ get_new_macaddr() {
ADDED_UNMANAGED=0 ADDED_UNMANAGED=0
NETWORKMANAGER_CONF=/etc/NetworkManager/NetworkManager.conf NETWORKMANAGER_CONF=/etc/NetworkManager/NetworkManager.conf
NM_OLDER_VERSION=1
networkmanager_is_running() { networkmanager_is_running() {
which nmcli > /dev/null 2>&1 || return 1 which nmcli > /dev/null 2>&1 || return 1
NM_VER=$(nmcli -v | grep -m1 -oE '[0-9]+(\.[0-9]+)*\.[0-9]+') NM_VER=$(nmcli -v | grep -m1 -oE '[0-9]+(\.[0-9]+)*\.[0-9]+')
version_cmp $NM_VER 0.9.10 version_cmp $NM_VER 0.9.10
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
NM_OLDER_VERSION=1
NMCLI_OUT=$(nmcli -t -f RUNNING nm) NMCLI_OUT=$(nmcli -t -f RUNNING nm)
else else
NM_OLDER_VERSION=0
NMCLI_OUT=$(nmcli -t -f RUNNING g) NMCLI_OUT=$(nmcli -t -f RUNNING g)
fi fi
[[ "$NMCLI_OUT" == "running" ]] [[ "$NMCLI_OUT" == "running" ]]
@ -521,7 +524,21 @@ fi
# start access point # start access point
echo "hostapd command-line interface: hostapd_cli -p $CONFDIR/hostapd_ctrl" echo "hostapd command-line interface: hostapd_cli -p $CONFDIR/hostapd_ctrl"
trap - SIGINT # reset trap trap - SIGINT # reset trap
hostapd $CONFDIR/hostapd.conf || die "Failed to run hostapd, maybe a program is interfering."
if ! hostapd $CONFDIR/hostapd.conf; then
echo -e "\nError: Failed to run hostapd, maybe a program is interfering." >&2
if networkmanager_is_running; then
echo "If an error like 'n80211: Could not configure driver mode' was thrown" >&2
echo "try running the following before starting create_ap:" >&2
if [[ $NM_OLDER_VERSION -eq 1 ]]; then
echo " nmcli nm wifi off" >&2
else
echo " nmcli r wifi off" >&2
fi
echo " rfkill unblock wlan" >&2
fi
die
fi
cleanup cleanup
exit 0 exit 0