Changeset 252 for trunk/dhcp/dhcpserver.py

Timestamp:

Dec 11, 2007, 2:23:21 AM (16 years ago)

Author:

ecprice

Message:

Allow fully qualified domains in the NICs table to override the
name.servers.csail.mit.edu domains.

File:

• trunk/dhcp/dhcpserver.py (modified) (1 diff)

trunk/dhcp/dhcpserver.py

@@ -110 +110 @@
         if ip is None:  #Deactivated?
             return False
-        hostname = nic.machine.name
-        if hostname is not None:
-            hostname += ".servers.csail.mit.edu"
+        if nic.hostname and '.' in nic.hostname:
+            hostname = nic.hostname
+        elif nic.machine.name:
+            hostname = nic.machine.name + '.servers.csail.mit.edu'
+        else:
+            hostname = None
         if ip is not None:
             ip = ipv4(ip)