From 01beb0be907000b121a98730f57f597d9dba2433 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 14 Sep 2024 20:16:04 +0800 Subject: [PATCH] Revert "luci-proto-ipv6: improve dhcpv6 support" This reverts commit dd457f9d1ad8ff3cf0a593886e8b66910790ad07. --- .../luasrc/model/cbi/admin_network/ifaces.lua | 2 +- .../luasrc/model/cbi/admin_network/proto_dhcpv6.lua | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua index adb63c8c..6b0c76a0 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -397,7 +397,7 @@ end -- Display DNS settings if dnsmasq is available -- -if has_dnsmasq then +if has_dnsmasq and net:proto() == "static" then m2 = Map("dhcp", "", "") local has_section = false diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua index 948bfe27..76caedcb 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua @@ -24,11 +24,6 @@ o:value("64") o.default = "auto" -o = section:taboption("general", Flag, "norelease", - translate("Do not send a Release when restarting"), - translate("Enable to minimise the chance of prefix change after a restart")) - - o = section:taboption("advanced", Flag, "defaultroute", translate("Use default gateway"), translate("If unchecked, no default route is configured"))