[xen master] tools/hotplug: Extend dhcpd conf, init and arg files search

[patchbot@xxxxxxx]

commit 17f80e7fc1e3bb49fc91794ef1b6e5a2f1b540cb
Author:     Diego Sueiro <diego.sueiro@xxxxxxx>
AuthorDate: Thu Aug 20 12:01:11 2020 +0100
Commit:     Wei Liu <wl@xxxxxxx>
CommitDate: Wed Sep 9 12:41:34 2020 +0000

    tools/hotplug: Extend dhcpd conf, init and arg files search
    
    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>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    Acked-by: Wei Liu <wl@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 82ee70aab4..42fa704e8d 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:
--
generated by git-patchbot for /home/xen/git/xen.git#master