updated ipxe binary; multiple fixes

apache/Dockerfile

@@ -32,6 +32,8 @@ COPY ./vars-vars /etc/vars-vars
 
 COPY ./vars-files /etc/vars-files
 
+COPY ./common.sh /common.sh
+
 COPY ./run.sh /run.sh
 
 EXPOSE 80

apache/apache2.conf

@@ -1,5 +1,7 @@
 # see http://sources.debian.net/src/apache2/2.4.10-1/debian/config-dir/apache2.conf
 
+ServerName netboot
+
 Mutex file:/var/lock/apache2 default
 PidFile /var/run/apache2/apache2.pid
 Timeout 300

data/apache/files/boot.ipxe

@@ -1,42 +1,8 @@
-<?php
-
-$common = ':shell
-shell
-
-:reboot
-reboot
-
-:boot-install
-set unix install/${install}
-set options vga=788 -- quiet
-goto boot-unix
-
-:boot-live
-set unix live/${live}
-set options vga=normal ramdisk_size=14332 root=/dev/nfs nfsroot=10.15.44.1:/pxeroot/${live} rw --
-goto boot-unix
-
-:boot-unix
-initrd unix/${unix}/initrd.img
-boot unix/${unix}/vmlinuz ${options}
-
-
-:boot-iso
-initrd iso/${iso}
-chain /memdisk iso raw
-boot
-
-:boot-winpe
-kernel winpe/${winpe}/wimboot
-initrd winpe/${winpe}/bcd                 BCD
-initrd winpe/${winpe}/boot.sdi            boot.sdi
-initrd winpe/${winpe}/boot.wim            boot.wim
-boot';
-
-echo "#!ipxe\n";
-echo "console --picture misc/splash.png\n";
-echo "menu gigi PXE\n\n";
+#!ipxe
+console --picture misc/splash.png
+menu netboot.${domain} PXE
 
+<?php
 
 $types = [['live', 'unix/live', 'Live'],
   ['iso', 'iso', 'ISO'],
@@ -66,14 +32,51 @@ foreach ($types as $type)
   }
 }
 
-echo "item --gap -- Misc
+?>
+
+item --gap -- Misc
+item chain-online Chain on rthoni.com
 item shell Shell
-item reboot Reboot\n";
-echo 'choose choice && goto ${choice}' . "\n";
+item reboot Reboot
+choose choice && goto ${choice}
 
-echo $labels;
+<?php
 
-echo $common;
+echo $labels;
 
 ?>
+:chain-online
+chain http://netboot.rthoni.com/boot.ipxe
+
+:shell
+shell
+
+:reboot
+reboot
 
+:boot-install
+set unix install/${install}
+set options vga=788 -- quiet
+goto boot-unix
+
+:boot-live
+set unix live/${live}
+set options vga=normal ramdisk_size=14332 root=/dev/nfs nfsroot=10.15.44.1:/pxeroot/${live} rw --
+goto boot-unix
+
+:boot-unix
+initrd unix/${unix}/initrd.img
+boot unix/${unix}/vmlinuz ${options}
+
+
+:boot-iso
+initrd iso/${iso}
+chain /memdisk iso raw
+boot
+
+:boot-winpe
+kernel winpe/${winpe}/wimboot
+initrd winpe/${winpe}/bcd                 BCD
+initrd winpe/${winpe}/boot.sdi            boot.sdi
+initrd winpe/${winpe}/boot.wim            boot.wim
+boot

isc-dhcp/dhcpd.conf

@@ -14,25 +14,30 @@ log-facility local7;
 
 subnet 10.15.100.0 netmask 255.255.255.0 {
 
+  # IP settings
   range 10.15.100.50 10.15.100.250;
   option subnet-mask 255.255.255.0;
   option broadcast-address 10.15.100.255;
   option routers 10.15.100.1;
 
+  # DNS settings
   option domain-name "site.rthoni.com";
+  option domain-search "site.rthoni.com rthoni.com";
   option domain-name-servers 10.15.100.1;
 
+  # Push custom routes to clients
   #option classless-routes 24, 10,15,42, 10.15.12,2;
   #option classless-routes-win 24, 10,15,42, 10.15.12,2;
 
+  # Netboot settings
   next-server 10.15.100.1;
+  #option root-path "10.15.100.1:/pxeroot/ubuntu";
   if exists user-class and ( option user-class = "iPXE-rthoni" ) {
+    option domain-search "site.rthoni.com";
     filename "http://netboot/boot.ipxe";
   }
   else {
     filename "ipxe-rthoni.kpxe";
   }
-#  option root-path "10.15.100.1:/pxeroot/ubuntu";
-
 }