From: Jo-Philipp Wich Date: Sat, 25 Jun 2011 23:29:42 +0000 (+0000) Subject: luci-0.10: merge r7240 X-Git-Tag: 0.10.0~107 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=582dee7343fb5166aed06c3b0bb3a6bada121572;p=oweals%2Fluci.git luci-0.10: merge r7240 --- diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 3debf58ba..cc54d4516 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -103,6 +103,9 @@ if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then p.description = translate("You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support") end +auto = s:taboption("physical", Flag, "auto", translate("Bring up on boot")) +auto.default = (m.uci:get("network", arg[1], "proto") == "none") and auto.disabled or auto.enabled + br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)")) br.enabled = "bridge" br.rmempty = true