From: Evan Broder <broder@mit.edu>
Date: Mon, 6 Jul 2009 00:16:47 +0000 (-0400)
Subject: In invirt-dhcp:
X-Git-Tag: 0.0.3~2
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dhcp.git/commitdiff_plain/9fd5fdfd5648b727cc7c0005ec56c77adef48099?hp=983fb79bd981ce343422d292cc0d1d1831a82158

In invirt-dhcp:
  * Include the server identifier field in DHCPOFFERs (LP: #395696).

svn path=/trunk/packages/invirt-dhcp/; revision=2361
---

diff --git a/debian/changelog b/debian/changelog
index ea490a8..0ad74a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dhcp (0.0.3) unstable; urgency=low
+
+  * Include the server identifier field in DHCPOFFERs (LP: #395696).
+
+ -- Evan Broder <broder@mit.edu>  Sun, 05 Jul 2009 17:15:09 -0700
+
 invirt-dhcp (0.0.2) unstable; urgency=low
 
   * Don't throw a sqlalchemy.exceptions.InvalidRequestError exception if
diff --git a/invirt-dhcpserver b/invirt-dhcpserver
index 04376d0..a1966d8 100755
--- a/invirt-dhcpserver
+++ b/invirt-dhcpserver
@@ -7,6 +7,7 @@ from pydhcplib.type_hw_addr import hwmac
 from pydhcplib.type_ipv4 import ipv4
 from pydhcplib.type_strlist import strlist
 import socket
+import os
 import IN
 
 import syslog as s
@@ -18,7 +19,8 @@ from invirt.config import structs as config
 dhcp_options = {'subnet_mask': config.dhcp.netmask,
                 'router': config.dhcp.gateway,
                 'domain_name_server': ','.join(config.dhcp.dns),
-                'ip_address_lease_time': 60*60*24}
+                'ip_address_lease_time': 60*60*24,
+                'server_identifier': socket.gethostbyname(os.uname()[1])}
 
 class DhcpBackend:
     def __init__(self):