xl2tpd: rename netifd protocol handler to l2tpv2 to avoid clashes with l2tpv3
Signed-off-by: Steven Barth <steven@midlink.org>
This commit is contained in:
parent
4cb5f96293
commit
981f2da457
2 changed files with 5 additions and 5 deletions
|
@ -65,7 +65,7 @@ define Package/xl2tpd/install
|
|||
$(INSTALL_DATA) ./files/options.xl2tpd $(1)/etc/ppp/
|
||||
|
||||
$(INSTALL_DIR) $(1)/lib/netifd/proto
|
||||
$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/netifd/proto
|
||||
$(INSTALL_BIN) ./files/l2tpv2.sh $(1)/lib/netifd/proto
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,xl2tpd))
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
init_proto "$@"
|
||||
}
|
||||
|
||||
proto_l2tp_init_config() {
|
||||
proto_l2tpv2_init_config() {
|
||||
proto_config_add_string "username"
|
||||
proto_config_add_string "password"
|
||||
proto_config_add_string "keepalive"
|
||||
|
@ -20,7 +20,7 @@ proto_l2tp_init_config() {
|
|||
no_device=1
|
||||
}
|
||||
|
||||
proto_l2tp_setup() {
|
||||
proto_l2tpv2_setup() {
|
||||
local config="$1"
|
||||
local iface="$2"
|
||||
local optfile="/tmp/l2tp/options.${config}"
|
||||
|
@ -77,7 +77,7 @@ proto_l2tp_setup() {
|
|||
xl2tpd-control connect l2tp-${config}
|
||||
}
|
||||
|
||||
proto_l2tp_teardown() {
|
||||
proto_l2tpv2_teardown() {
|
||||
local interface="$1"
|
||||
local optfile="/tmp/l2tp/options.${interface}"
|
||||
|
||||
|
@ -103,5 +103,5 @@ proto_l2tp_teardown() {
|
|||
}
|
||||
|
||||
[ -n "$INCLUDE_ONLY" ] || {
|
||||
add_protocol l2tp
|
||||
add_protocol l2tpv2
|
||||
}
|
Loading…
Reference in a new issue