Merge branch 'master' into schema_work

html/skins/alteeve/pxe.txt

@@ -9,21 +9,20 @@ ddns-update-style none;
 option arch code 93 = unsigned integer 16;
 
 subnet #!variable!network!# netmask 255.255.0.0 {
-	default-lease-time 600;
-	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 {
-			filename "BOOTX64.efi";
-		} else {
-			filename "pxelinux.0";
-		}
-	}
+    default-lease-time 600;
+    max-lease-time     1200;
+    range              #!variable!range!#;
+    option routers     #!variable!router!#;
+
+    class "pxeclients" {
+        match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
+        next-server #!variable!router!#;
+        if option arch = 00:07 {
+	    filename "BOOTX64.efi";
+        } else {
+            filename "pxelinux.0";
+        }
+    }
 }
 <!-- end dhcpd_conf -->
 

tools/striker-manage-install-target

@@ -503,9 +503,9 @@ sub setup_boot_environment
 	   $striker_number =  1 if not $striker_number;
 	   $striker_number =~ s/^0//;
 	my $third_octet    =  (10 * $striker_number) + 4;
-	   $third_octet    = 254 if $third_octet > 254;
-	my $first_part     = ($bcn_network =~ /^(\d+\.\d+)\./)[0].".".$third_octet;
-	my $range          = $first_part.".10 ".$first_part.".250";
+	   $third_octet    =  254 if $third_octet > 254;
+	my $first_part     =  ($bcn_network =~ /^(\d+\.\d+)\./)[0].".".$third_octet;
+	my $range          =  $first_part.".10 ".$first_part.".250";
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
 		's1:striker_number' => $striker_number,
 		's2:third_octet'    => $third_octet,