From 6554b3751da1430201e71c48819b803fe502f8cc Mon Sep 17 00:00:00 2001 From: zhipengl Date: Tue, 11 Dec 2018 00:30:56 +0800 Subject: [PATCH] Refactor source code patches for dhcp package 3 source patches can be removed. 2 patches adds support for wrs_install_uuid in the dhclient script. This added script part just copy the whole content of dhclient-enter-hooks. Following this script part, it will call this hook script if the hook exist under /etc/. However, our hook file existed in /etc/dhcp/ folder will be called by sbin/dhclient-script as well. I'd like to use dhcp config package to creat /etc/dhclient-enter-hooks soft linked to /etc/dhcp/dhclient-enter-hooks, so that it can call dhclient script and no need to add this 2 patches. Support-disable-nsupdate.patch can be removed as we already fixed port conflict issue in https://review.openstack.org/#/c/622711/ Deployment test pass and related script file check pass! Story: 2004473 Task: 28164 Change-Id: If50ae697062a7d0c8a2831fbcc0f5641aaa41ec7 Signed-off-by: zhipengl --- dhcp-config/centos/build_srpm.data | 2 +- dhcp-config/centos/dhcp-config.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dhcp-config/centos/build_srpm.data b/dhcp-config/centos/build_srpm.data index 2c3b2cb..75f295c 100644 --- a/dhcp-config/centos/build_srpm.data +++ b/dhcp-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=2 diff --git a/dhcp-config/centos/dhcp-config.spec b/dhcp-config/centos/dhcp-config.spec index 1b9e661..98fcc88 100644 --- a/dhcp-config/centos/dhcp-config.spec +++ b/dhcp-config/centos/dhcp-config.spec @@ -27,10 +27,11 @@ package StarlingX configuration files of dhcp to system folder. %{__install} -d %{buildroot}%{dhcpconfdir} %{__install} -p -m 0755 dhclient-enter-hooks %{buildroot}%{dhcpconfdir}/dhclient-enter-hooks %{__install} -p -m 0644 dhclient.conf %{buildroot}%{dhcpconfdir}/dhclient.conf +ln -s %{dhcpconfdir}/dhclient-enter-hooks %{buildroot}%{_sysconfdir}/dhclient-enter-hooks %post %files %config(noreplace) %{dhcpconfdir}/dhclient.conf %{dhcpconfdir}/dhclient-enter-hooks - +%{_sysconfdir}/dhclient-enter-hooks