Added --virt-name option
This commit is contained in:
parent
b51a2d2349
commit
a414ac035b
21
lnxrouter
21
lnxrouter
|
@ -87,6 +87,7 @@ Options:
|
||||||
--no-virt Do not create virtual interface
|
--no-virt Do not create virtual interface
|
||||||
Using this you can't use same wlan interface
|
Using this you can't use same wlan interface
|
||||||
for both Internet and AP
|
for both Internet and AP
|
||||||
|
--virt-name <name> Naming convension for virtual interface
|
||||||
-c <channel> Channel number (default: 1)
|
-c <channel> Channel number (default: 1)
|
||||||
--country <code> Set two-letter country code for regularity
|
--country <code> Set two-letter country code for regularity
|
||||||
(example: US)
|
(example: US)
|
||||||
|
@ -197,6 +198,7 @@ define_global_variables(){
|
||||||
|
|
||||||
# script variables
|
# script variables
|
||||||
VWIFI_IFACE= # virtual wifi interface name, if created
|
VWIFI_IFACE= # virtual wifi interface name, if created
|
||||||
|
VIRT_PREFIX= # prefix to use for naming virtual interface
|
||||||
AP_IFACE= # can be VWIFI_IFACE or WIFI_IFACE
|
AP_IFACE= # can be VWIFI_IFACE or WIFI_IFACE
|
||||||
USE_IWCONFIG=0 # some device can't use iw
|
USE_IWCONFIG=0 # some device can't use iw
|
||||||
|
|
||||||
|
@ -405,6 +407,11 @@ parse_user_options(){
|
||||||
shift
|
shift
|
||||||
NO_VIRT=1
|
NO_VIRT=1
|
||||||
;;
|
;;
|
||||||
|
--virt-name)
|
||||||
|
shift
|
||||||
|
VIRT_PREFIX="$1"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
--country)
|
--country)
|
||||||
shift
|
shift
|
||||||
|
@ -662,7 +669,11 @@ alloc_new_vface_name() { # only for wifi
|
||||||
local i=0
|
local i=0
|
||||||
local v_iface_name=
|
local v_iface_name=
|
||||||
while :; do
|
while :; do
|
||||||
v_iface_name="lnxr$i"
|
if [[ -z $VIRT_PREFIX ]]; then
|
||||||
|
v_iface_name="x$i${WIFI_IFACE}"
|
||||||
|
else
|
||||||
|
v_iface_name="$VIRT_PREFIX$i"
|
||||||
|
fi
|
||||||
if ! is_interface ${v_iface_name} && [[ ! -f $COMMON_CONFDIR/vfaces/${v_iface_name} ]]; then
|
if ! is_interface ${v_iface_name} && [[ ! -f $COMMON_CONFDIR/vfaces/${v_iface_name} ]]; then
|
||||||
mkdir -p $COMMON_CONFDIR/vfaces
|
mkdir -p $COMMON_CONFDIR/vfaces
|
||||||
touch $COMMON_CONFDIR/vfaces/${v_iface_name}
|
touch $COMMON_CONFDIR/vfaces/${v_iface_name}
|
||||||
|
@ -1575,6 +1586,14 @@ check_wifi_settings() {
|
||||||
fi
|
fi
|
||||||
echo "WARN: If AP doesn't work, read https://github.com/oblique/create_ap/blob/master/howto/realtek.md" >&2
|
echo "WARN: If AP doesn't work, read https://github.com/oblique/create_ap/blob/master/howto/realtek.md" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -z $VIRT_PREFIX ]]; then
|
||||||
|
if [[ ${#WIFI_IFACE} -gt 13 ]]; then
|
||||||
|
echo "WARN: $WIFI_IFACE has ${#WIFI_IFACE} characters which might be too long. If AP doesn't work, see --virt-name and https://github.com/garywill/linux-router/issues/44" >&2
|
||||||
|
fi
|
||||||
|
elif [[ ${#VIRT_PREFIX} -gt 14 ]]; then
|
||||||
|
echo "WARN: option --virt-name $VIRT_PREFIX has ${#VIRT_PREFIX} characters which might be too long, consider making it shorter in case of errors" >&2
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
check_if_new_mac_valid() {
|
check_if_new_mac_valid() {
|
||||||
|
|
Loading…
Reference in New Issue