Added support for PXE boot configuration

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 32606613ea95e45acc9b80c8919f03ada6726fd4..ffd15a4fce8c2c87bd3a26e5cbb632b92492550f 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -162,6 +162,9 @@ dhcp_dnsmasq_ednspacket_max = '<abbr title="maximal">max.</abbr> <abbr title="Ex
 dhcp_dnsmasq_dhcpleasemax = '<abbr title="maximal">max.</abbr> <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Leases'
 dhcp_dnsmasq_addnhosts = 'additional hostfile'
 dhcp_dnsmasq_queryport = 'query port'
+dhcp_dnsmasq_enabletftp = 'Enable TFTP-Server'
+dhcp_dnsmasq_tftproot = 'TFTP-Server Root'
+dhcp_dnsmasq_dhcpboot = 'Network Boot Image'
 a_n_switch = 'Switch'
 a_n_conntrack = 'Active Connections'
 a_n_conntrack_desc = 'This page gives an overview over currently active network connections.'

diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml
index fac415d4ab2611012ec0d65f6dafd72eeae99cff..266f36258561e9c8b2cab9621ad3b4e695ea6041 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.xml
+++ b/i18n/english/luasrc/i18n/admin-core.en.xml
@@ -166,6 +166,9 @@
 <i18n:msg xml:id="dhcp_dnsmasq_dhcpleasemax"><abbr title="maximal">max.</abbr> <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Leases</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_addnhosts">additional hostfile</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_queryport">query port</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_enabletftp">Enable TFTP-Server</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_tftproot">TFTP-Server Root</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_dhcpboot">Network Boot Image</i18n:msg>
 <i18n:msg xml:id="a_n_switch">Switch</i18n:msg>
 <i18n:msg xml:id="a_n_conntrack">Active Connections</i18n:msg>
 <i18n:msg xml:id="a_n_conntrack_desc">This page gives an overview over currently active network connections.</i18n:msg>

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 1ffd88731574e80cad9d249b7ad7232fc7475ece..234cddd09c2ca474701578c7c4e5a2cf60158259 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -180,6 +180,9 @@ dhcp_dnsmasq_resolvfile = 'Resolvdatei'
 dhcp_dnsmasq_resolvfile_desc = 'Lokale DNS-Datei'
 dhcp_dnsmasq_strictorder = 'Strikte Reihenfolge'
 dhcp_dnsmasq_strictorder_desc = 'DNS-Server werden strikt der Reihenfolge in der Resolvdatei nach abgefragt'
+dhcp_dnsmasq_enabletftp = 'TFTP-Server aktivieren'
+dhcp_dnsmasq_tftproot = 'TFTP-Server Wurzelverzeichnis'
+dhcp_dnsmasq_dhcpboot = 'Netzwerk-Boot Abbild'
 file = 'Datei'
 frag = 'Frag.'
 frequency = 'Frequenz'

diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml
index 4e3dc94cee05aeafd47fe87816071f8fc5cf4d56..d2ffe000cd014365ba0a2c008b2d99bc196e4cbe 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.xml
+++ b/i18n/german/luasrc/i18n/admin-core.de.xml
@@ -184,6 +184,9 @@
 <i18n:msg xml:id="dhcp_dnsmasq_resolvfile_desc">Lokale DNS-Datei</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_strictorder">Strikte Reihenfolge</i18n:msg>
 <i18n:msg xml:id="dhcp_dnsmasq_strictorder_desc">DNS-Server werden strikt der Reihenfolge in der Resolvdatei nach abgefragt</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_enabletftp">TFTP-Server aktivieren</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_tftproot">TFTP-Server Wurzelverzeichnis</i18n:msg>
+<i18n:msg xml:id="dhcp_dnsmasq_dhcpboot">Netzwerk-Boot Abbild</i18n:msg>
 <i18n:msg xml:id="file">Datei</i18n:msg>
 <i18n:msg xml:id="frag">Frag.</i18n:msg>
 <i18n:msg xml:id="frequency">Frequenz</i18n:msg>

diff --git a/modules/admin-core/root/lib/uci/schema/default/dhcp b/modules/admin-core/root/lib/uci/schema/default/dhcp
index 5f352328b1bb4ebba16fd041d74a72b2ab67ced9..86a5a474c985f271483f0131a3a258c47e10380e 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/dhcp
+++ b/modules/admin-core/root/lib/uci/schema/default/dhcp
@@ -82,14 +82,12 @@ config variable
        option section 'dhcp.dnsmasq'
        option title 'Leasefile'
        option description 'file where given DHCP-leases will be stored'
-       option datatype file
 
 config variable
        option name 'resolvfile'
        option section 'dhcp.dnsmasq'
        option title 'Resolvfile'
        option description 'local DNS file'
-       option datatype file
 
 config variable
        option name 'nohosts'
@@ -152,6 +150,23 @@ config variable
        option title 'query port'
        option datatype port
 
+config variable
+       option name 'enable_tftp'
+       option section 'dhcp.dnsmasq'
+       option title 'Enable builtin TFTP-Server'
+       option datatype boolean
+
+config variable
+       option name 'tftp_root'
+       option section 'dhcp.dnsmasq'
+       option title 'TFTP-Server root directory'
+       option datatype directory
+
+config variable
+       option name 'dhcp_boot'
+       option section 'dhcp.dnsmasq'
+       option title 'DHCP Boot image'
+
 
 config section
        option name 'dhcp'

diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
index e8530647154f6ec31368a63de4517597a5cb049b..04ec1e15c44319ad61a2791f9d8b9a5eba7765a4 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
@@ -38,5 +38,8 @@ s:option(Value, "ednspacket_max").optional = true
 s:option(Value, "dhcpleasemax").optional = true
 s:option(Value, "addnhosts").optional = true
 s:option(Value, "queryport").optional = true
+s:option(Flag, "enable_tftp").optional = true
+s:option(Value, "tftp_root").optional = true
+s:option(Value, "dhcp_boot").optional = true
 
 return m
\ No newline at end of file