- All architectures that support TFTP booting also support DCHP, so remove the "supports-dhcp" condition

- According to the text, Alpha supports BOOTP
- Use dhcp3-server for examples rather than dhcp (version 2)
- tftpd-hpa does not use /tftpboot by default; allow for this in examples

11 files changed, 11 insertions, 11 deletions

diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index 2f9ab20dc..e2806ba8b 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 02c851382..d82430d70 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
 smp="smp-alternatives"
diff --git a/build/arch-options/arm b/build/arch-options/arm
index 5d8e33b06..3cc122d66 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index 0acb98476..d1adc0a9b 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index c82f65c74..0a1dfc220 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
 smp="smp-alternatives"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index fda153a2e..3120099ef 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -12,7 +12,7 @@ smp_config_option="SMP support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="parted.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
diff --git a/build/arch-options/m68k b/build/arch-options/m68k
index a8d43c57d..8d4b84a5d 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="atari-fdisk.txt;mac-fdisk.txt;amiga-fdisk.txt;pmac-fdisk.txt"
-network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/mips b/build/arch-options/mips
index 144df29c3..8a0b6730e 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-nfsroot"
+network="supports-tftp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index 86863abb7..f41f8b28f 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index 00fc9701e..48b6880b9 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="mac-fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
 smp="supports-smp"
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 17bedec44..563a9955c 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt"
-network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot"
 other="supports-serial-console;rescue-needs-root-disk"
 # SMP support is described in hardware/supported/sparc.xml