From: Keir Fraser <keir.fraser@citrix.com>
Date: Sat, 2 Feb 2008 10:55:25 +0000 (+0000)
Subject: Fix to Xen NAT network scripts for Debian.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14341^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e9e114d5f4b870ca0b167f202b59957e7cbb64b5;p=xen.git

Fix to Xen NAT network scripts for Debian.
Xen recently (changeset 16873:86c32269ba60) started looking for a
DHCP defaults file in /etc/sysconfig/dhcpd or /etc/defaults/dhcp.
Debian (lenny) puts this file in a different place though:
/etc/default/dhcp3-server.  I added this location to Xen's search
path.

From: Michael Abd-El-Malek <mabdelmalek@cmu.edu>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/examples/xen-network-common.sh b/tools/examples/xen-network-common.sh
index 8fe9500440..7014333df0 100644
--- a/tools/examples/xen-network-common.sh
+++ b/tools/examples/xen-network-common.sh
@@ -76,7 +76,7 @@ find_dhcpd_init_file()
 
 find_dhcpd_arg_file()
 {
-  first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp
+  first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp3-server
 }
 
 # configure interfaces which act as pure bridge ports: