Merge branch 'master' into schema_work

html/skins/alteeve/pxe.txt

@@ -13,12 +13,11 @@ subnet #!variable!network!# netmask 255.255.0.0 {
     max-lease-time     1200;
     range              #!variable!range!#;
     option routers     #!variable!router!#;
-	next-server        #!variable!router!#;
 
     class "pxeclients" {
         match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
-		next-server 192.168.0.1;
-		if option pxe-system-type = 00:07 {
+        next-server #!variable!router!#;
+        if option arch = 00:07 {
 	    filename "BOOTX64.efi";
         } else {
             filename "pxelinux.0";