[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/3] tools/hotplug: Extend dhcpd conf, init and arg files search
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Diego Sueiro <diego.sueiro@xxxxxxx>
- Date: Thu, 20 Aug 2020 12:01:11 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XjycY1NYkgo1wh82XjE9VDeZgdK5y5E7vxVDBjDZIzQ=; b=V/MUU8yn3uLpU82JZhKuWhasAbJ4uiEuGykl17omBH/C8umT+kmclwbcYiGMoLACJTuCJ6PQ9SFXxVL3Nj/rEMKgPkejqKaEOqHKkAW+6rqgF7C4eYGBh3iYvvmd+6VU90dndN/IZuYQuVBgaySJ9YvZmO0rktt+HR3ozIzvGOT9ABwiVd3JNeyflzirm3T8brA+xEPmFz0cen5GlCX/FAtGqpbpybJm8JbIxIAm+S6+aCyfDIPoEbPN3FBqRKBiGR1+vZtbBKFFU/uhdXWEd/b+2DK/zbqxPr50m1VRr9vhDNNXhoG6KwNmqHEeWMrIW5jUcMsmqyz7iEJC8JN/NA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iOP/ysMGA3sPkx086uKd6Rs55XW2s/46lFzx4RAm0ewhghOJEn2PWVjHp5XE1eGCg7S8bzQVrEs9N7+nVInIEK2kYJCBjJATyRrM4t0WIdEVE2+CkezBnbqgXWiodXGCGW665skkRTcgYdSrr2v2Dh325qE5ltOR3mUuTmnT9w+YtO9hlCOJQOHc4c8r1KLMz0ljGJZx9OJZKc69d1rw/JpUnSSwcte5O5U2W7AXuD2+lboyDn2deJOL3AjpbNVpp79Mf7VeLXIhcucLEPlpSfGpKqG/WuNqvXXXMlENMjvTJpeBC5e0OjuOE9W5F6PXcyrAsSVqf34wMQjaz5URng==
- Authentication-results-original: lists.xenproject.org; dkim=none (message not signed) header.d=none; lists.xenproject.org; dmarc=none action=none header.from=arm.com;
- Cc: nd@xxxxxxx, Diego Sueiro <diego.sueiro@xxxxxxx>, Ian Jackson <ian.jackson@xxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Thu, 20 Aug 2020 11:01:39 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Original-authentication-results: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=arm.com;
Newer versions of the ISC dhcp server expect the dhcpd.conf file
to be located at /etc/dhcp directory.
Also, some distributions and Yocto based ones have these installation
paths by default: /etc/init.d/{isc-dhcp-server,dhcp-server} and
/etc/default/dhcp-server.
Signed-off-by: Diego Sueiro <diego.sueiro@xxxxxxx>
---
tools/hotplug/Linux/xen-network-common.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/hotplug/Linux/xen-network-common.sh
b/tools/hotplug/Linux/xen-network-common.sh
index 8dd3a62..be632ce 100644
--- a/tools/hotplug/Linux/xen-network-common.sh
+++ b/tools/hotplug/Linux/xen-network-common.sh
@@ -64,18 +64,18 @@ first_file()
find_dhcpd_conf_file()
{
- first_file -f /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf
+ first_file -f /etc/dhcp/dhcpd.conf /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf
}
find_dhcpd_init_file()
{
- first_file -x /etc/init.d/{dhcp3-server,dhcp,dhcpd}
+ first_file -x
/etc/init.d/{isc-dhcp-server,dhcp-server,dhcp3-server,dhcp,dhcpd}
}
find_dhcpd_arg_file()
{
- first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp
/etc/default/dhcp3-server
+ first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp
/etc/default/dhcp-server /etc/default/dhcp3-server
}
# configure interfaces which act as pure bridge ports:
--
2.7.4
|
