[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 3/3] tools/hotplug: Extend dhcpd conf, init and arg files search
- To: Diego Sueiro <Diego.Sueiro@xxxxxxx>
- From: Bertrand Marquis <Bertrand.Marquis@xxxxxxx>
- Date: Thu, 27 Aug 2020 14:14:34 +0000
- Accept-language: en-GB, en-US
- 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=3jp2GJ9xZQfOf9QC/QIB01tTS5MnjO3CMPjF5y1G3yc=; b=d9MqfwCTwNu/o4trDmhtAdXugm6FOG/f6e+ivGaOuJ3DDqavz+u6lmm9cLV0UCsoplQS/SdHN+p8PVvMWZiVqbxFpOha3Coyo5t7eJCFa8jdt+0cz4ES5EZZ758IOi3B0rMAPouBY2zFRKXiVPomKWMnThT/TId88fRwRP+zrLvkURLmeKK5BCsp4UZs7AwhVncdY9OD0OKf80azUbh8hlJWYo8BdFgLa2BbIKG6VghWMmxtLBMfwhRDIW7XkMoEgwoFEUB9fTrOVkHIstuWXUrpqgYvincbe2eDxA2MFGJRtw8yHBxVMrJMkbgflTu8kIAvVqULYEP4A/zgluaG3g==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=edSNPNayjDBE3AV8XQt0WSG7fgK/Pa40/tEGrZygi9epktm4xppGN/pRNcCTeCgXJvV/+5lrJxrktNEn/yQ9M/xFyIbt6EFKfAFxl8EEHT17/OBkmtjyg7VgILLTHUEluamezzUnlVXEPCf7rZ+qLFjmj8FowG85Obr6Zv2+JbqnehJM5UoMULABwwh0gZ7654O0HCJrCyTHboGBLdEZ606O8J42LHtFM6Apqn1myNtDIJQLhTor4PQr6gV0TtWJWfcoKK++YVJulqxmixpiPeWH+6PIAOb2RL3npCjdpV5oGeMC8L08TrfEtVq5xztZ65RMVd4gmyhM+TsEuVb6jQ==
- Authentication-results-original: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com;
- Cc: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, nd <nd@xxxxxxx>, Ian Jackson <ian.jackson@xxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Thu, 27 Aug 2020 14:15:05 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Original-authentication-results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com;
- Thread-index: AQHWduGMroN03EFTHUKgnG7TjUTaS6lMCwMA
- Thread-topic: [PATCH 3/3] tools/hotplug: Extend dhcpd conf, init and arg files search
> On 20 Aug 2020, at 12:01, Diego Sueiro <Diego.Sueiro@xxxxxxx> wrote:
>
> 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>
> ---
> 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
>
>
|
