Merge branch 'master' into master

Resolves merge conflicts in pull request #224.

Signed-off-by: Dávid Benko <[email protected]>

CMakeLists.txt

@@ -36,7 +36,7 @@ if(${DHCPV4_SUPPORT})
 	set(EXT_SRC ${EXT_SRC} src/dhcpv4.c)
 endif(${DHCPV4_SUPPORT})
 
-add_executable(odhcpd src/odhcpd.c src/config.c src/router.c src/dhcpv6.c src/ndp.c src/dhcpv6-ia.c src/netlink.c ${EXT_SRC})
+add_executable(odhcpd src/odhcpd.c src/config.c src/router.c src/dhcpv6.c src/ndp.c src/dhcpv6-ia.c src/dhcpv6-pxe.c src/netlink.c ${EXT_SRC})
 target_link_libraries(odhcpd resolv ubox uci ${libnl} ${EXT_LINK})
 
 # Installation

README

@@ -40,6 +40,7 @@ prefix delegation and can be used to relay RA, DHCPv6 and NDP between routed
       and only serving NDP for DAD and for traffic to the router itself
       [Warning: you should provide additional firewall rules for security]
 
+5. IPv6 PxE Support.
 
 ** Compiling **
 
@@ -111,6 +112,8 @@ router			list    <local address>		Routers to announce
 							accepts IPv4 only
 dns			list	<local address>		DNS servers to announce
 							accepts IPv4 and IPv6
+dnr			list	disabled		Encrypted DNS servers to announce
+			<priority> <domain name> [<comma separated IP addresses> <SvcParams (key=value)>...]
 dns_service		bool	1			Announce the address of interface as DNS service
 							if the list of dns is empty
 domain			list	<local search domain>	Search domains to announce
@@ -170,3 +173,8 @@ hostid		string				IPv6 host identifier
 name		string				Hostname
 leasetime	string				DHCPv4/v6 leasetime
 
+Sections of type boot6
+Option		Type	Required		Description
+url		string	yes		e.g. tftp://[fd11::1]/pxe.efi
+arch		integer	no		the arch code. 07 is EFI.
+						If not present, this boot6 will be the default.