Merge pull request #237 from cnjhb/master

Fix FREQ_BAND for config files
This commit is contained in:
Lakindu Akash 2022-03-19 23:13:09 +05:30 committed by GitHub
commit 6afde1771c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1030,6 +1030,11 @@ read_config() {
# Read switches and their values # Read switches and their values
opt_name="${line%%=*}" opt_name="${line%%=*}"
opt_val="${line#*=}" opt_val="${line#*=}"
if [[ $opt_name == "FREQ_BAND" ]] ; then
FREQ_BAND_SET=1
fi
if is_config_opt "$opt_name" ; then if is_config_opt "$opt_name" ; then
eval $opt_name="\$opt_val" eval $opt_name="\$opt_val"
else else
@ -1041,6 +1046,8 @@ read_config() {
ARGS=( "$@" ) ARGS=( "$@" )
FREQ_BAND_SET=0
# Preprocessing for --config before option-parsing starts # Preprocessing for --config before option-parsing starts
for ((i=0; i<$#; i++)); do for ((i=0; i<$#; i++)); do
if [[ "${ARGS[i]}" = "--config" ]]; then if [[ "${ARGS[i]}" = "--config" ]]; then
@ -1059,8 +1066,6 @@ GETOPT_ARGS=$(getopt -o hc:w:g:de:nm: -l "help","hidden","hostapd-debug:","hosta
[[ $? -ne 0 ]] && exit 1 [[ $? -ne 0 ]] && exit 1
eval set -- "$GETOPT_ARGS" eval set -- "$GETOPT_ARGS"
FREQ_BAND_SET=0
while :; do while :; do
case "$1" in case "$1" in
-h|--help) -h|--help)