140 files changed, 14 insertions, 7 deletions

diff --git a/tools/i386/netboot/3c503/nbgrub b/tools/i386/netboot/3c503/nbgrub
index 4f4a14df4..5f4def496 100644
--- a/tools/i386/netboot/3c503/nbgrub
+++ b/tools/i386/netboot/3c503/nbgrub
diff --git a/tools/i386/netboot/3c503/pxegrub b/tools/i386/netboot/3c503/pxegrub
index cce227069..7e662603d 100644
--- a/tools/i386/netboot/3c503/pxegrub
+++ b/tools/i386/netboot/3c503/pxegrub
diff --git a/tools/i386/netboot/3c503/stage1 b/tools/i386/netboot/3c503/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/3c503/stage1
+++ b/tools/i386/netboot/3c503/stage1
diff --git a/tools/i386/netboot/3c503/stage2 b/tools/i386/netboot/3c503/stage2
index 35dbd34cb..6a4865d65 100644
--- a/tools/i386/netboot/3c503/stage2
+++ b/tools/i386/netboot/3c503/stage2
diff --git a/tools/i386/netboot/3c507/nbgrub b/tools/i386/netboot/3c507/nbgrub
index 2a09e2095..3f72e513e 100644
--- a/tools/i386/netboot/3c507/nbgrub
+++ b/tools/i386/netboot/3c507/nbgrub
diff --git a/tools/i386/netboot/3c507/pxegrub b/tools/i386/netboot/3c507/pxegrub
index 55527173b..1b7caa324 100644
--- a/tools/i386/netboot/3c507/pxegrub
+++ b/tools/i386/netboot/3c507/pxegrub
diff --git a/tools/i386/netboot/3c507/stage1 b/tools/i386/netboot/3c507/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/3c507/stage1
+++ b/tools/i386/netboot/3c507/stage1
diff --git a/tools/i386/netboot/3c507/stage2 b/tools/i386/netboot/3c507/stage2
index 83b8308bf..2b1d4f3f3 100644
--- a/tools/i386/netboot/3c507/stage2
+++ b/tools/i386/netboot/3c507/stage2
diff --git a/tools/i386/netboot/3c509/nbgrub b/tools/i386/netboot/3c509/nbgrub
index fca541707..feb8e46f2 100644
--- a/tools/i386/netboot/3c509/nbgrub
+++ b/tools/i386/netboot/3c509/nbgrub
diff --git a/tools/i386/netboot/3c509/pxegrub b/tools/i386/netboot/3c509/pxegrub
index 00f4c227d..6114a12b4 100644
--- a/tools/i386/netboot/3c509/pxegrub
+++ b/tools/i386/netboot/3c509/pxegrub
diff --git a/tools/i386/netboot/3c509/stage1 b/tools/i386/netboot/3c509/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/3c509/stage1
+++ b/tools/i386/netboot/3c509/stage1
diff --git a/tools/i386/netboot/3c509/stage2 b/tools/i386/netboot/3c509/stage2
index 8923e18aa..5c7a65a60 100644
--- a/tools/i386/netboot/3c509/stage2
+++ b/tools/i386/netboot/3c509/stage2
diff --git a/tools/i386/netboot/3c529/nbgrub b/tools/i386/netboot/3c529/nbgrub
index b1dd42069..cc5ab8381 100644
--- a/tools/i386/netboot/3c529/nbgrub
+++ b/tools/i386/netboot/3c529/nbgrub
diff --git a/tools/i386/netboot/3c529/pxegrub b/tools/i386/netboot/3c529/pxegrub
index 7a265d20a..14b767e58 100644
--- a/tools/i386/netboot/3c529/pxegrub
+++ b/tools/i386/netboot/3c529/pxegrub
diff --git a/tools/i386/netboot/3c529/stage1 b/tools/i386/netboot/3c529/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/3c529/stage1
+++ b/tools/i386/netboot/3c529/stage1
diff --git a/tools/i386/netboot/3c529/stage2 b/tools/i386/netboot/3c529/stage2
index 98f710a27..64f9d89d5 100644
--- a/tools/i386/netboot/3c529/stage2
+++ b/tools/i386/netboot/3c529/stage2
diff --git a/tools/i386/netboot/3c595/nbgrub b/tools/i386/netboot/3c595/nbgrub
index f4d7ca004..74effed46 100644
--- a/tools/i386/netboot/3c595/nbgrub
+++ b/tools/i386/netboot/3c595/nbgrub
diff --git a/tools/i386/netboot/3c595/pxegrub b/tools/i386/netboot/3c595/pxegrub
index 3e5a81018..4d28d49c0 100644
--- a/tools/i386/netboot/3c595/pxegrub
+++ b/tools/i386/netboot/3c595/pxegrub
diff --git a/tools/i386/netboot/3c595/stage1 b/tools/i386/netboot/3c595/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/3c595/stage1
+++ b/tools/i386/netboot/3c595/stage1
diff --git a/tools/i386/netboot/3c595/stage2 b/tools/i386/netboot/3c595/stage2
index a1638948d..25126d668 100644
--- a/tools/i386/netboot/3c595/stage2
+++ b/tools/i386/netboot/3c595/stage2
diff --git a/tools/i386/netboot/3c90x/nbgrub b/tools/i386/netboot/3c90x/nbgrub
index d9d9a7bfe..0598d82d0 100644
--- a/tools/i386/netboot/3c90x/nbgrub
+++ b/tools/i386/netboot/3c90x/nbgrub
diff --git a/tools/i386/netboot/3c90x/pxegrub b/tools/i386/netboot/3c90x/pxegrub
index 621456a88..32002398c 100644
--- a/tools/i386/netboot/3c90x/pxegrub
+++ b/tools/i386/netboot/3c90x/pxegrub
diff --git a/tools/i386/netboot/3c90x/stage1 b/tools/i386/netboot/3c90x/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/3c90x/stage1
+++ b/tools/i386/netboot/3c90x/stage1
diff --git a/tools/i386/netboot/3c90x/stage2 b/tools/i386/netboot/3c90x/stage2
index 28a350009..0841f1d3e 100644
--- a/tools/i386/netboot/3c90x/stage2
+++ b/tools/i386/netboot/3c90x/stage2
diff --git a/tools/i386/netboot/cs89x0/nbgrub b/tools/i386/netboot/cs89x0/nbgrub
new file mode 100644
index 000000000..28ecbebc7
--- /dev/null
+++ b/tools/i386/netboot/cs89x0/nbgrub
diff --git a/tools/i386/netboot/cs89x0/pxegrub b/tools/i386/netboot/cs89x0/pxegrub
new file mode 100644
index 000000000..c7ae62678
--- /dev/null
+++ b/tools/i386/netboot/cs89x0/pxegrub
diff --git a/tools/i386/netboot/cs89x0/stage1 b/tools/i386/netboot/cs89x0/stage1
new file mode 100755
index 000000000..3d96f6eca
--- /dev/null
+++ b/tools/i386/netboot/cs89x0/stage1
diff --git a/tools/i386/netboot/cs89x0/stage2 b/tools/i386/netboot/cs89x0/stage2
new file mode 100644
index 000000000..28ad8dc0d
--- /dev/null
+++ b/tools/i386/netboot/cs89x0/stage2
diff --git a/tools/i386/netboot/davicom/nbgrub b/tools/i386/netboot/davicom/nbgrub
new file mode 100644
index 000000000..4bd5d8383
--- /dev/null
+++ b/tools/i386/netboot/davicom/nbgrub
diff --git a/tools/i386/netboot/davicom/pxegrub b/tools/i386/netboot/davicom/pxegrub
new file mode 100644
index 000000000..22a6a0d27
--- /dev/null
+++ b/tools/i386/netboot/davicom/pxegrub
diff --git a/tools/i386/netboot/davicom/stage1 b/tools/i386/netboot/davicom/stage1
new file mode 100755
index 000000000..3d96f6eca
--- /dev/null
+++ b/tools/i386/netboot/davicom/stage1
diff --git a/tools/i386/netboot/davicom/stage2 b/tools/i386/netboot/davicom/stage2
new file mode 100644
index 000000000..b5d22c603
--- /dev/null
+++ b/tools/i386/netboot/davicom/stage2
diff --git a/tools/i386/netboot/depca/nbgrub b/tools/i386/netboot/depca/nbgrub
index 2b413376b..3e93ce716 100644
--- a/tools/i386/netboot/depca/nbgrub
+++ b/tools/i386/netboot/depca/nbgrub
diff --git a/tools/i386/netboot/depca/pxegrub b/tools/i386/netboot/depca/pxegrub
index 458733521..b8285de5b 100644
--- a/tools/i386/netboot/depca/pxegrub
+++ b/tools/i386/netboot/depca/pxegrub
diff --git a/tools/i386/netboot/depca/stage1 b/tools/i386/netboot/depca/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/depca/stage1
+++ b/tools/i386/netboot/depca/stage1
diff --git a/tools/i386/netboot/depca/stage2 b/tools/i386/netboot/depca/stage2
index 339375ce3..811d7ce66 100644
--- a/tools/i386/netboot/depca/stage2
+++ b/tools/i386/netboot/depca/stage2
diff --git a/tools/i386/netboot/eepro/nbgrub b/tools/i386/netboot/eepro/nbgrub
index c9a080623..f62e82697 100644
--- a/tools/i386/netboot/eepro/nbgrub
+++ b/tools/i386/netboot/eepro/nbgrub
diff --git a/tools/i386/netboot/eepro/pxegrub b/tools/i386/netboot/eepro/pxegrub
index de839080d..92e3f0461 100644
--- a/tools/i386/netboot/eepro/pxegrub
+++ b/tools/i386/netboot/eepro/pxegrub
diff --git a/tools/i386/netboot/eepro/stage1 b/tools/i386/netboot/eepro/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/eepro/stage1
+++ b/tools/i386/netboot/eepro/stage1
diff --git a/tools/i386/netboot/eepro/stage2 b/tools/i386/netboot/eepro/stage2
index 5703e33c8..dd0e0120f 100644
--- a/tools/i386/netboot/eepro/stage2
+++ b/tools/i386/netboot/eepro/stage2
diff --git a/tools/i386/netboot/eepro100/nbgrub b/tools/i386/netboot/eepro100/nbgrub
index 841acc541..26cc23cd3 100644
--- a/tools/i386/netboot/eepro100/nbgrub
+++ b/tools/i386/netboot/eepro100/nbgrub
diff --git a/tools/i386/netboot/eepro100/pxegrub b/tools/i386/netboot/eepro100/pxegrub
index 7eea03239..cbe97166f 100644
--- a/tools/i386/netboot/eepro100/pxegrub
+++ b/tools/i386/netboot/eepro100/pxegrub
diff --git a/tools/i386/netboot/eepro100/stage1 b/tools/i386/netboot/eepro100/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/eepro100/stage1
+++ b/tools/i386/netboot/eepro100/stage1
diff --git a/tools/i386/netboot/eepro100/stage2 b/tools/i386/netboot/eepro100/stage2
index a8ac76752..0036c6822 100644
--- a/tools/i386/netboot/eepro100/stage2
+++ b/tools/i386/netboot/eepro100/stage2
diff --git a/tools/i386/netboot/epic100/nbgrub b/tools/i386/netboot/epic100/nbgrub
index b896e95d3..93e5adea2 100644
--- a/tools/i386/netboot/epic100/nbgrub
+++ b/tools/i386/netboot/epic100/nbgrub
diff --git a/tools/i386/netboot/epic100/pxegrub b/tools/i386/netboot/epic100/pxegrub
index b54698e3f..7309b5913 100644
--- a/tools/i386/netboot/epic100/pxegrub
+++ b/tools/i386/netboot/epic100/pxegrub
diff --git a/tools/i386/netboot/epic100/stage1 b/tools/i386/netboot/epic100/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/epic100/stage1
+++ b/tools/i386/netboot/epic100/stage1
diff --git a/tools/i386/netboot/epic100/stage2 b/tools/i386/netboot/epic100/stage2
index 7742e2bc2..eb1b19cfa 100644
--- a/tools/i386/netboot/epic100/stage2
+++ b/tools/i386/netboot/epic100/stage2
diff --git a/tools/i386/netboot/exos205/nbgrub b/tools/i386/netboot/exos205/nbgrub
index 5218c738d..af9b29195 100644
--- a/tools/i386/netboot/exos205/nbgrub
+++ b/tools/i386/netboot/exos205/nbgrub
diff --git a/tools/i386/netboot/exos205/pxegrub b/tools/i386/netboot/exos205/pxegrub
index 951284ffe..25ee4a267 100644
--- a/tools/i386/netboot/exos205/pxegrub
+++ b/tools/i386/netboot/exos205/pxegrub
diff --git a/tools/i386/netboot/exos205/stage1 b/tools/i386/netboot/exos205/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/exos205/stage1
+++ b/tools/i386/netboot/exos205/stage1
diff --git a/tools/i386/netboot/exos205/stage2 b/tools/i386/netboot/exos205/stage2
index 38e9e1562..81fcbe665 100644
--- a/tools/i386/netboot/exos205/stage2
+++ b/tools/i386/netboot/exos205/stage2
diff --git a/tools/i386/netboot/grub b/tools/i386/netboot/grub
index b4d77fe36..9031dd028 100755
--- a/tools/i386/netboot/grub
+++ b/tools/i386/netboot/grub
diff --git a/tools/i386/netboot/lance/nbgrub b/tools/i386/netboot/lance/nbgrub
index fe9df36be..0667479cd 100644
--- a/tools/i386/netboot/lance/nbgrub
+++ b/tools/i386/netboot/lance/nbgrub
diff --git a/tools/i386/netboot/lance/pxegrub b/tools/i386/netboot/lance/pxegrub
index 265f276c0..c58240700 100644
--- a/tools/i386/netboot/lance/pxegrub
+++ b/tools/i386/netboot/lance/pxegrub
diff --git a/tools/i386/netboot/lance/stage1 b/tools/i386/netboot/lance/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/lance/stage1
+++ b/tools/i386/netboot/lance/stage1
diff --git a/tools/i386/netboot/lance/stage2 b/tools/i386/netboot/lance/stage2
index 653f7b212..9cf9522bf 100644
--- a/tools/i386/netboot/lance/stage2
+++ b/tools/i386/netboot/lance/stage2
diff --git a/tools/i386/netboot/makeImages b/tools/i386/netboot/makeImages
index 79d45c11e..39d13df73 100755
--- a/tools/i386/netboot/makeImages
+++ b/tools/i386/netboot/makeImages
@@ -1,13 +1,13 @@
 #!/bin/sh
 # compile multiple grub stages (1, 2, pxegrub and nbgrub) for all supported network cards
 LOCALPATH=`pwd`
-PATHGRUB="../grub-0.91" # Path were grub is stored
-DRIVERTOCOMPILE=`grep NETBOOT_DRIVERS= ${PATHGRUB}/configure.in | cut -d " " -f 4 | cut -d "." -f 1`
+PATHGRUB="../grub-0.95" # Path were grub is stored
+DRIVERTOCOMPILE=`grep NETBOOT_DRIVERS= ${PATHGRUB}/configure.ac | cut -d " " -f 4 | cut -d "." -f 1`
 
 echo "Cleaning old drivers"
 for i in `ls`
 do
-	if [ -d $i ]; then
+	if [ -d $i ] && [ $i != CVS ]; then
 	rm -rf $i
 	fi
 	
@@ -26,6 +26,6 @@ for i in ${DRIVERTOCOMPILE}
 	cp stage2/stage2 ${LOCALPATH}/$i/stage2
 	cp stage2/pxegrub ${LOCALPATH}/$i/pxegrub
 	cp stage2/nbgrub ${LOCALPATH}/$i/nbgrub
-	echo "compil done for " $i
+	echo "compil done for" $i
 done
 cp ${PATHGRUB}/grub/grub ${LOCALPATH} -f
diff --git a/tools/i386/netboot/make_boot_network b/tools/i386/netboot/make_boot_network
index a0b0302a4..b02e6657c 100755
--- a/tools/i386/netboot/make_boot_network
+++ b/tools/i386/netboot/make_boot_network
@@ -3,6 +3,13 @@
 type=$1
 [ -z "$type" ] && { echo "usage: $0 <network card type> (eg: 3c90x)" ; exit 1; }
 
+if [ ! -d "$type" ]; then
+        echo "$type: no such network driver"
+        echo "available drivers are:"
+        echo `find -not -name CVS -type d -maxdepth 1 -printf '%P\n'`
+        exit 1;
+fi
+
 [ -e menu.lst ] || { echo "missing file menu.lst, create one based on menu.lst.example"; exit 1; }
 
 ln -sf ${type}/stage1 stage1
diff --git a/tools/i386/netboot/menu.lst.example b/tools/i386/netboot/menu.lst.example
index 41022579a..3465fac62 100644
--- a/tools/i386/netboot/menu.lst.example
+++ b/tools/i386/netboot/menu.lst.example
@@ -4,18 +4,18 @@ default 0
 title nfs
 dhcp
 tftpserver 192.168.100.39
-kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
+kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
 initrd (nd)/network.rdz
 
 title ftp
 dhcp
 tftpserver 192.168.100.39
-kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:ftp,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
+kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:ftp,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
 initrd (nd)/network.rdz
 
 title rescue
 dhcp
 tftpserver 192.168.100.39
-kernel (nd)/vmlinuz rescue rw root=/dev/ram3 ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
+kernel (nd)/vmlinuz rescue rw root=/dev/ram3 ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
 initrd (nd)/network.rdz
 
diff --git a/tools/i386/netboot/natsemi/nbgrub b/tools/i386/netboot/natsemi/nbgrub
new file mode 100644
index 000000000..7f3892c7e
--- /dev/null
+++ b/tools/i386/netboot/natsemi/nbgrub
diff --git a/tools/i386/netboot/natsemi/pxegrub b/tools/i386/netboot/natsemi/pxegrub
new file mode 100644
index 000000000..a481cee5e
--- /dev/null
+++ b/tools/i386/netboot/natsemi/pxegrub
diff --git a/tools/i386/netboot/natsemi/stage1 b/tools/i386/netboot/natsemi/stage1
new file mode 100755
index 000000000..3d96f6eca
--- /dev/null
+++ b/tools/i386/netboot/natsemi/stage1
diff --git a/tools/i386/netboot/natsemi/stage2 b/tools/i386/netboot/natsemi/stage2
new file mode 100644
index 000000000..66761ddee
--- /dev/null
+++ b/tools/i386/netboot/natsemi/stage2
diff --git a/tools/i386/netboot/ne/nbgrub b/tools/i386/netboot/ne/nbgrub
index 622e5db90..209fec7a4 100644
--- a/tools/i386/netboot/ne/nbgrub
+++ b/tools/i386/netboot/ne/nbgrub
diff --git a/tools/i386/netboot/ne/pxegrub b/tools/i386/netboot/ne/pxegrub
index 0d59f4473..44f6bc476 100644
--- a/tools/i386/netboot/ne/pxegrub
+++ b/tools/i386/netboot/ne/pxegrub
diff --git a/tools/i386/netboot/ne/stage1 b/tools/i386/netboot/ne/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/ne/stage1
+++ b/tools/i386/netboot/ne/stage1
diff --git a/tools/i386/netboot/ne/stage2 b/tools/i386/netboot/ne/stage2
index 60877704a..c0777f634 100644
--- a/tools/i386/netboot/ne/stage2
+++ b/tools/i386/netboot/ne/stage2
diff --git a/tools/i386/netboot/ne2100/nbgrub b/tools/i386/netboot/ne2100/nbgrub
index 86a640cfd..ca4c56f07 100644
--- a/tools/i386/netboot/ne2100/nbgrub
+++ b/tools/i386/netboot/ne2100/nbgrub
diff --git a/tools/i386/netboot/ne2100/pxegrub b/tools/i386/netboot/ne2100/pxegrub
index 289459191..37ddbbf8a 100644
--- a/tools/i386/netboot/ne2100/pxegrub
+++ b/tools/i386/netboot/ne2100/pxegrub
diff --git a/tools/i386/netboot/ne2100/stage1 b/tools/i386/netboot/ne2100/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/ne2100/stage1
+++ b/tools/i386/netboot/ne2100/stage1
diff --git a/tools/i386/netboot/ne2100/stage2 b/tools/i386/netboot/ne2100/stage2
index 4db05ff1b..6bd1acb02 100644
--- a/tools/i386/netboot/ne2100/stage2
+++ b/tools/i386/netboot/ne2100/stage2
diff --git a/tools/i386/netboot/ni5010/nbgrub b/tools/i386/netboot/ni5010/nbgrub
index befe61355..b5b935ebd 100644
--- a/tools/i386/netboot/ni5010/nbgrub
+++ b/tools/i386/netboot/ni5010/nbgrub
diff --git a/tools/i386/netboot/ni5010/pxegrub b/tools/i386/netboot/ni5010/pxegrub
index 9ba588161..fe5a6d0a2 100644
--- a/tools/i386/netboot/ni5010/pxegrub
+++ b/tools/i386/netboot/ni5010/pxegrub
diff --git a/tools/i386/netboot/ni5010/stage1 b/tools/i386/netboot/ni5010/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/ni5010/stage1
+++ b/tools/i386/netboot/ni5010/stage1
diff --git a/tools/i386/netboot/ni5010/stage2 b/tools/i386/netboot/ni5010/stage2
index ad87dd76e..bf26459ab 100644
--- a/tools/i386/netboot/ni5010/stage2
+++ b/tools/i386/netboot/ni5010/stage2
diff --git a/tools/i386/netboot/ni5210/nbgrub b/tools/i386/netboot/ni5210/nbgrub
index f32d888e0..04b92c46f 100644
--- a/tools/i386/netboot/ni5210/nbgrub
+++ b/tools/i386/netboot/ni5210/nbgrub
diff --git a/tools/i386/netboot/ni5210/pxegrub b/tools/i386/netboot/ni5210/pxegrub
index c9378a973..06f3020ad 100644
--- a/tools/i386/netboot/ni5210/pxegrub
+++ b/tools/i386/netboot/ni5210/pxegrub
diff --git a/tools/i386/netboot/ni5210/stage1 b/tools/i386/netboot/ni5210/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/ni5210/stage1
+++ b/tools/i386/netboot/ni5210/stage1
diff --git a/tools/i386/netboot/ni5210/stage2 b/tools/i386/netboot/ni5210/stage2
index 3f2b6897e..220cb0816 100644
--- a/tools/i386/netboot/ni5210/stage2
+++ b/tools/i386/netboot/ni5210/stage2
diff --git a/tools/i386/netboot/ni6510/nbgrub b/tools/i386/netboot/ni6510/nbgrub
index 9f738a857..91f390b52 100644
--- a/tools/i386/netboot/ni6510/nbgrub
+++ b/tools/i386/netboot/ni6510/nbgrub
diff --git a/tools/i386/netboot/ni6510/pxegrub b/tools/i386/netboot/ni6510/pxegrub
index 57b4cbc31..8ab495c37 100644
--- a/tools/i386/netboot/ni6510/pxegrub
+++ b/tools/i386/netboot/ni6510/pxegrub
diff --git a/tools/i386/netboot/ni6510/stage1 b/tools/i386/netboot/ni6510/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/ni6510/stage1
+++ b/tools/i386/netboot/ni6510/stage1
diff --git a/tools/i386/netboot/ni6510/stage2 b/tools/i386/netboot/ni6510/stage2
index e1d209afc..3ebadf22a 100644
--- a/tools/i386/netboot/ni6510/stage2
+++ b/tools/i386/netboot/ni6510/stage2
diff --git a/tools/i386/netboot/ns8390/nbgrub b/tools/i386/netboot/ns8390/nbgrub
index e2fc9c88f..ddf5b55c0 100644
--- a/tools/i386/netboot/ns8390/nbgrub
+++ b/tools/i386/netboot/ns8390/nbgrub
diff --git a/tools/i386/netboot/ns8390/pxegrub b/tools/i386/netboot/ns8390/pxegrub
index 2d2aa4654..be75a76a8 100644
--- a/tools/i386/netboot/ns8390/pxegrub
+++ b/tools/i386/netboot/ns8390/pxegrub
diff --git a/tools/i386/netboot/ns8390/stage1 b/tools/i386/netboot/ns8390/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/ns8390/stage1
+++ b/tools/i386/netboot/ns8390/stage1
diff --git a/tools/i386/netboot/ns8390/stage2 b/tools/i386/netboot/ns8390/stage2
index 689d8513f..e3815fa64 100644
--- a/tools/i386/netboot/ns8390/stage2
+++ b/tools/i386/netboot/ns8390/stage2
diff --git a/tools/i386/netboot/otulip/nbgrub b/tools/i386/netboot/otulip/nbgrub
index 59b7c5e74..e98fe5290 100644
--- a/tools/i386/netboot/otulip/nbgrub
+++ b/tools/i386/netboot/otulip/nbgrub
diff --git a/tools/i386/netboot/otulip/pxegrub b/tools/i386/netboot/otulip/pxegrub
index 48ae66374..e741218a6 100644
--- a/tools/i386/netboot/otulip/pxegrub
+++ b/tools/i386/netboot/otulip/pxegrub
diff --git a/tools/i386/netboot/otulip/stage1 b/tools/i386/netboot/otulip/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/otulip/stage1
+++ b/tools/i386/netboot/otulip/stage1
diff --git a/tools/i386/netboot/otulip/stage2 b/tools/i386/netboot/otulip/stage2
index f8353a1bb..286952eba 100644
--- a/tools/i386/netboot/otulip/stage2
+++ b/tools/i386/netboot/otulip/stage2
diff --git a/tools/i386/netboot/rtl8139/nbgrub b/tools/i386/netboot/rtl8139/nbgrub
index d8686c84c..5ef3d141b 100644
--- a/tools/i386/netboot/rtl8139/nbgrub
+++ b/tools/i386/netboot/rtl8139/nbgrub
diff --git a/tools/i386/netboot/rtl8139/pxegrub b/tools/i386/netboot/rtl8139/pxegrub
index 46e4665cc..143ed5462 100644
--- a/tools/i386/netboot/rtl8139/pxegrub
+++ b/tools/i386/netboot/rtl8139/pxegrub
diff --git a/tools/i386/netboot/rtl8139/stage1 b/tools/i386/netboot/rtl8139/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/rtl8139/stage1
+++ b/tools/i386/netboot/rtl8139/stage1
diff --git a/tools/i386/netboot/rtl8139/stage2 b/tools/i386/netboot/rtl8139/stage2
index d3418e589..4fb729d6e 100644
--- a/tools/i386/netboot/rtl8139/stage2
+++ b/tools/i386/netboot/rtl8139/stage2
diff --git a/tools/i386/netboot/sis900/nbgrub b/tools/i386/netboot/sis900/nbgrub
index d3ff63241..856771aae 100644
--- a/tools/i386/netboot/sis900/nbgrub
+++ b/tools/i386/netboot/sis900/nbgrub
diff --git a/tools/i386/netboot/sis900/pxegrub b/tools/i386/netboot/sis900/pxegrub
index 0de4866b6..59e0244d0 100644
--- a/tools/i386/netboot/sis900/pxegrub
+++ b/tools/i386/netboot/sis900/pxegrub
diff --git a/tools/i386/netboot/sis900/stage1 b/tools/i386/netboot/sis900/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/sis900/stage1
+++ b/tools/i386/netboot/sis900/stage1
diff --git a/tools/i386/netboot/sis900/stage2 b/tools/i386/netboot/sis900/stage2
index 5b466e882..9ad200099 100644
--- a/tools/i386/netboot/sis900/stage2
+++ b/tools/i386/netboot/sis900/stage2
diff --git a/tools/i386/netboot/sk_g16/nbgrub b/tools/i386/netboot/sk_g16/nbgrub
index a3684a225..5f8a4973c 100644
--- a/tools/i386/netboot/sk_g16/nbgrub
+++ b/tools/i386/netboot/sk_g16/nbgrub
diff --git a/tools/i386/netboot/sk_g16/pxegrub b/tools/i386/netboot/sk_g16/pxegrub
index 69a34390d..9d2fd22ce 100644
--- a/tools/i386/netboot/sk_g16/pxegrub
+++ b/tools/i386/netboot/sk_g16/pxegrub
diff --git a/tools/i386/netboot/sk_g16/stage1 b/tools/i386/netboot/sk_g16/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/sk_g16/stage1
+++ b/tools/i386/netboot/sk_g16/stage1
diff --git a/tools/i386/netboot/sk_g16/stage2 b/tools/i386/netboot/sk_g16/stage2
index 3a118dcdb..0aa999bd3 100644
--- a/tools/i386/netboot/sk_g16/stage2
+++ b/tools/i386/netboot/sk_g16/stage2
diff --git a/tools/i386/netboot/smc9000/nbgrub b/tools/i386/netboot/smc9000/nbgrub
index 94932dac3..d6208c387 100644
--- a/tools/i386/netboot/smc9000/nbgrub
+++ b/tools/i386/netboot/smc9000/nbgrub
diff --git a/tools/i386/netboot/smc9000/pxegrub b/tools/i386/netboot/smc9000/pxegrub
index d4f9a4133..335d1b2d3 100644
--- a/tools/i386/netboot/smc9000/pxegrub
+++ b/tools/i386/netboot/smc9000/pxegrub
diff --git a/tools/i386/netboot/smc9000/stage1 b/tools/i386/netboot/smc9000/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/smc9000/stage1
+++ b/tools/i386/netboot/smc9000/stage1
diff --git a/tools/i386/netboot/smc9000/stage2 b/tools/i386/netboot/smc9000/stage2
index 9017fac90..959ba63f0 100644
--- a/tools/i386/netboot/smc9000/stage2
+++ b/tools/i386/netboot/smc9000/stage2
diff --git a/tools/i386/netboot/stage1.3c59x b/tools/i386/netboot/stage1.3c59x
deleted file mode 100755
index 1cd1292ac..000000000
--- a/tools/i386/netboot/stage1.3c59x
+++ /dev/null
diff --git a/tools/i386/netboot/stage1.3c90x b/tools/i386/netboot/stage1.3c90x
deleted file mode 100755
index 1cd1292ac..000000000
--- a/tools/i386/netboot/stage1.3c90x
+++ /dev/null
diff --git a/tools/i386/netboot/stage1.eepro100 b/tools/i386/netboot/stage1.eepro100
deleted file mode 100755
index 90f9c2210..000000000
--- a/tools/i386/netboot/stage1.eepro100
+++ /dev/null
diff --git a/tools/i386/netboot/stage1.rtl8139 b/tools/i386/netboot/stage1.rtl8139
deleted file mode 100755
index 1cd1292ac..000000000
--- a/tools/i386/netboot/stage1.rtl8139
+++ /dev/null
diff --git a/tools/i386/netboot/stage1.tulip b/tools/i386/netboot/stage1.tulip
deleted file mode 100755
index 1cd1292ac..000000000
--- a/tools/i386/netboot/stage1.tulip
+++ /dev/null
diff --git a/tools/i386/netboot/stage1.via-rhine b/tools/i386/netboot/stage1.via-rhine
deleted file mode 100755
index c15d90622..000000000
--- a/tools/i386/netboot/stage1.via-rhine
+++ /dev/null
diff --git a/tools/i386/netboot/stage2.3c59x b/tools/i386/netboot/stage2.3c59x
deleted file mode 100644
index f1efb805d..000000000
--- a/tools/i386/netboot/stage2.3c59x
+++ /dev/null
diff --git a/tools/i386/netboot/stage2.3c90x b/tools/i386/netboot/stage2.3c90x
deleted file mode 100644
index b53b66d56..000000000
--- a/tools/i386/netboot/stage2.3c90x
+++ /dev/null
diff --git a/tools/i386/netboot/stage2.eepro100 b/tools/i386/netboot/stage2.eepro100
deleted file mode 100644
index 5fb781dd8..000000000
--- a/tools/i386/netboot/stage2.eepro100
+++ /dev/null
diff --git a/tools/i386/netboot/stage2.rtl8139 b/tools/i386/netboot/stage2.rtl8139
deleted file mode 100644
index 39136b67c..000000000
--- a/tools/i386/netboot/stage2.rtl8139
+++ /dev/null
diff --git a/tools/i386/netboot/stage2.tulip b/tools/i386/netboot/stage2.tulip
deleted file mode 100644
index ca238d182..000000000
--- a/tools/i386/netboot/stage2.tulip
+++ /dev/null
diff --git a/tools/i386/netboot/stage2.via-rhine b/tools/i386/netboot/stage2.via-rhine
deleted file mode 100644
index 7fb5cb251..000000000
--- a/tools/i386/netboot/stage2.via-rhine
+++ /dev/null
diff --git a/tools/i386/netboot/tiara/nbgrub b/tools/i386/netboot/tiara/nbgrub
index f40d1b39d..c6e1be61c 100644
--- a/tools/i386/netboot/tiara/nbgrub
+++ b/tools/i386/netboot/tiara/nbgrub
diff --git a/tools/i386/netboot/tiara/pxegrub b/tools/i386/netboot/tiara/pxegrub
index cf1321d0b..8958b93bc 100644
--- a/tools/i386/netboot/tiara/pxegrub
+++ b/tools/i386/netboot/tiara/pxegrub
diff --git a/tools/i386/netboot/tiara/stage1 b/tools/i386/netboot/tiara/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/tiara/stage1
+++ b/tools/i386/netboot/tiara/stage1
diff --git a/tools/i386/netboot/tiara/stage2 b/tools/i386/netboot/tiara/stage2
index 5db3cb1cd..ac890c297 100644
--- a/tools/i386/netboot/tiara/stage2
+++ b/tools/i386/netboot/tiara/stage2
diff --git a/tools/i386/netboot/tulip/nbgrub b/tools/i386/netboot/tulip/nbgrub
index 89a4ce0d4..b55321acb 100644
--- a/tools/i386/netboot/tulip/nbgrub
+++ b/tools/i386/netboot/tulip/nbgrub
diff --git a/tools/i386/netboot/tulip/pxegrub b/tools/i386/netboot/tulip/pxegrub
index 8d2344af1..d6400bc08 100644
--- a/tools/i386/netboot/tulip/pxegrub
+++ b/tools/i386/netboot/tulip/pxegrub
diff --git a/tools/i386/netboot/tulip/stage1 b/tools/i386/netboot/tulip/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/tulip/stage1
+++ b/tools/i386/netboot/tulip/stage1
diff --git a/tools/i386/netboot/tulip/stage2 b/tools/i386/netboot/tulip/stage2
index e637e814a..bb787876a 100644
--- a/tools/i386/netboot/tulip/stage2
+++ b/tools/i386/netboot/tulip/stage2
diff --git a/tools/i386/netboot/via_rhine/nbgrub b/tools/i386/netboot/via_rhine/nbgrub
new file mode 100644
index 000000000..6d32a2801
--- /dev/null
+++ b/tools/i386/netboot/via_rhine/nbgrub
diff --git a/tools/i386/netboot/via_rhine/pxegrub b/tools/i386/netboot/via_rhine/pxegrub
new file mode 100644
index 000000000..1c1a04437
--- /dev/null
+++ b/tools/i386/netboot/via_rhine/pxegrub
diff --git a/tools/i386/netboot/via_rhine/stage1 b/tools/i386/netboot/via_rhine/stage1
new file mode 100755
index 000000000..3d96f6eca
--- /dev/null
+++ b/tools/i386/netboot/via_rhine/stage1
diff --git a/tools/i386/netboot/via_rhine/stage2 b/tools/i386/netboot/via_rhine/stage2
new file mode 100644
index 000000000..cae5cd9c6
--- /dev/null
+++ b/tools/i386/netboot/via_rhine/stage2
diff --git a/tools/i386/netboot/w89c840/nbgrub b/tools/i386/netboot/w89c840/nbgrub
index 068dc4d68..ea30621cd 100644
--- a/tools/i386/netboot/w89c840/nbgrub
+++ b/tools/i386/netboot/w89c840/nbgrub
diff --git a/tools/i386/netboot/w89c840/pxegrub b/tools/i386/netboot/w89c840/pxegrub
index 38e17d93d..4a87da113 100644
--- a/tools/i386/netboot/w89c840/pxegrub
+++ b/tools/i386/netboot/w89c840/pxegrub
diff --git a/tools/i386/netboot/w89c840/stage1 b/tools/i386/netboot/w89c840/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/w89c840/stage1
+++ b/tools/i386/netboot/w89c840/stage1
diff --git a/tools/i386/netboot/w89c840/stage2 b/tools/i386/netboot/w89c840/stage2
index e49a7aea6..cad6e1beb 100644
--- a/tools/i386/netboot/w89c840/stage2
+++ b/tools/i386/netboot/w89c840/stage2
diff --git a/tools/i386/netboot/wd/nbgrub b/tools/i386/netboot/wd/nbgrub
index e08bc08e6..9d75d57da 100644
--- a/tools/i386/netboot/wd/nbgrub
+++ b/tools/i386/netboot/wd/nbgrub
diff --git a/tools/i386/netboot/wd/pxegrub b/tools/i386/netboot/wd/pxegrub
index 6f3759ccf..d41c51e8f 100644
--- a/tools/i386/netboot/wd/pxegrub
+++ b/tools/i386/netboot/wd/pxegrub
diff --git a/tools/i386/netboot/wd/stage1 b/tools/i386/netboot/wd/stage1
index 8c923a183..3d96f6eca 100755
--- a/tools/i386/netboot/wd/stage1
+++ b/tools/i386/netboot/wd/stage1
diff --git a/tools/i386/netboot/wd/stage2 b/tools/i386/netboot/wd/stage2
index 64988d4eb..7f1575c0b 100644
--- a/tools/i386/netboot/wd/stage2
+++ b/tools/i386/netboot/wd/stage2