dhcp changes

[Stephen Samuel <samnospam@bcgreen.com>]

I've attached the patches to knoppix-terminalserver.

This does two things:

1: removes the tagged boot reference in dhcp.conf
   (should we make this an option?)
   Note: This DOES NOT remove the code which creates
   the tagged boot, so re-enabling the code that is left
   commented out in dhcpd.conf should go back to the old
   behavior.

2: added an option to use the alternate dhcp ports, as
   specified on the rom-o-matic.net site.  This turns out to
   be quite nice because what happens is that the machine
   will first boot from the knoppix terminal server using the
   106[78] ports, and then, for the second half of the boot, will
   use the standared (67/68) DHCP ports to get an 'official' config.

I've given it relatively simple testing.  If people would like, I can
make the whole file available on my website for people to who
want to test but are too lazy to run patch :-)
http://www.bcgreen.com/knoppix/terminal-server/

Further fixes and suggestions are gratefully accepted.

--
Stephen Samuel +1(604)876-0426             samnospam@bcgreen.com
		   http://www.bcgreen.com/
  Powerful committed communication. Transformation touching
    the jewel within each person and bringing it to light.

--- knoppix-terminalserver	2005/09/30 03:32:57	1.1
+++ knoppix-terminalserver	2005/09/30 03:33:31
@@ -60,6 +60,7 @@
 for i in $NAMESERVERS; do ALLNAMESERVERS="${ALLNAMESERVERS:+$ALLNAMESERVERS,} $i"; done
 GATEWAYS="$GATEWAY"
 case "$OPTIONS" in *masq*) GATEWAYS="${IP} $GATEWAYS";; esac
+case "$OPTIONS" in *dhcp1067*)  DHCP_PORTS='local-port 1067; remote-port 1068;'  ;;  esac
 ALLGATEWAYS=""
 for i in $GATEWAYS; do ALLGATEWAYS="${ALLGATEWAYS:+$ALLGATEWAYS,} $i"; done
 cat >/etc/dhcp3/dhcpd.conf <<EOT
@@ -70,11 +71,13 @@
 allow bootp;
 default-lease-time 600;
 max-lease-time 7200;
+$DHCP_PORTS
 
 subnet ${NETWORK}.0 netmask ${NETMASK} {
   next-server $IP;
-  if substring (option vendor-class-identifier, 0, 9) = "Etherboot" { filename "etherboot.nbi"; }
-  else { filename "pxelinux.0"; }
+#  if substring (option vendor-class-identifier, 0, 9) = "Etherboot" { filename "etherboot.nbi"; }
+#  else { filename "pxelinux.0"; }
+  filename "pxelinux.0"; 
   option subnet-mask ${NETMASK};
   range ${IPRANGE_FROM} ${IPRANGE_TO};
   ${ALLNAMESERVERS:+option domain-name-servers $ALLNAMESERVERS;}
@@ -449,6 +452,7 @@
 ITEM_SQUID="Transparenter WWW Cache/Proxy"
 ITEM_IPTABLES="IP Masquerading+Forwarding"
 ITEM_NX="NX ThinClient setup"
+ITEM_DHCP1067="DHCP auf wechselnden Toren"
 ;;
 es)
 TITLE_CARD="Selecciona el dispositivo de red conectado a la red de clientes"
@@ -478,6 +482,7 @@
 ITEM_SQUID="Proxy WWW transparente caché"
 ITEM_IPTABLES="Enmascaramiento IP + reenvío"
 ITEM_NX="Configuración del ThinClient NX"
+ITEM_DHCP1067="Alternate DHCP ports"
 ;;
 *)
 TITLE_CARD="Choose network device connected to client network"
@@ -507,6 +512,7 @@
 ITEM_SQUID="Transparent WWW cache/proxy"
 ITEM_IPTABLES="IP masquerading+forwarding"
 ITEM_NX="NX ThinClient setup"
+ITEM_DHCP1067="DHCP on alternate ports (1067/1068)"
 ;;
 esac
 
@@ -581,6 +587,7 @@
 ${USE_BIND:+dns "$ITEM_DNS (+4MB)" on} \
 ${USE_SQUID:+squid "$ITEM_SQUID (+40MB)" off} \
 ${USE_NX:+nx "$ITEM_NX" off} \
+dhcp1067 "$ITEM_DHCP1067" off \
 2>"$TMP" || bailout 2
 OPTIONS="$(sed 's,",,g;s,/, ,g' <$TMP)"
 echo "OPTIONS=\"$OPTIONS\"" >>"$CONFIG"