From b3b2ea80e5c3aae0d9ab7814893c4dde05979c89 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Sun, 5 Jul 2009 20:21:41 -0400 Subject: [PATCH] Revert the server identifier in the DHCP server. Including the server ID implies that we're capable of handling unicast communication with DHCP clients, which we're currently not. This reverts commit 2361. svn path=/trunk/packages/invirt-dhcp/; revision=2362 --- debian/changelog | 6 ------ invirt-dhcpserver | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ad74a9..ea490a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -invirt-dhcp (0.0.3) unstable; urgency=low - - * Include the server identifier field in DHCPOFFERs (LP: #395696). - - -- Evan Broder 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 a1966d8..04376d0 100755 --- a/invirt-dhcpserver +++ b/invirt-dhcpserver @@ -7,7 +7,6 @@ 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 @@ -19,8 +18,7 @@ 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, - 'server_identifier': socket.gethostbyname(os.uname()[1])} + 'ip_address_lease_time': 60*60*24} class DhcpBackend: def __init__(self): -- 1.7.9.5