1*4882a593SmuzhiyunFrom d027b1d85a8c1a0193b6e4a00083d3038d699a59 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Kai Kang <kai.kang@windriver.com> 3*4882a593SmuzhiyunDate: Tue, 22 Sep 2020 15:02:33 +0800 4*4882a593SmuzhiyunSubject: [PATCH] There are conflict of config files between kea and lib32-kea: 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun| Error: Transaction test error: 7*4882a593Smuzhiyun| file /etc/kea/kea-ctrl-agent.conf conflicts between attempted installs of 8*4882a593Smuzhiyun lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 9*4882a593Smuzhiyun| file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of 10*4882a593Smuzhiyun lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunBecause they are all commented out, replace the expanded libdir path with 13*4882a593Smuzhiyun'$libdir' in the config files to avoid conflict. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunUpstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] 16*4882a593SmuzhiyunSigned-off-by: Kai Kang <kai.kang@windriver.com> 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- 20*4882a593Smuzhiyun src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- 21*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 3 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre 24*4882a593Smuzhiyunindex e6ae8b8..50a3092 100644 25*4882a593Smuzhiyun--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre 26*4882a593Smuzhiyun+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre 27*4882a593Smuzhiyun@@ -51,7 +51,8 @@ 28*4882a593Smuzhiyun // Agent will fail to start. 29*4882a593Smuzhiyun "hooks-libraries": [ 30*4882a593Smuzhiyun // { 31*4882a593Smuzhiyun-// "library": "@libdir@/kea/hooks/control-agent-commands.so", 32*4882a593Smuzhiyun+// // Replace $libdir with real library path /usr/lib or /usr/lib64 33*4882a593Smuzhiyun+// "library": "$libdir/kea/hooks/control-agent-commands.so", 34*4882a593Smuzhiyun // "parameters": { 35*4882a593Smuzhiyun // "param1": "foo" 36*4882a593Smuzhiyun // } 37*4882a593Smuzhiyundiff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre 38*4882a593Smuzhiyunindex 26bf163..49ddb0a 100644 39*4882a593Smuzhiyun--- a/src/bin/keactrl/kea-dhcp4.conf.pre 40*4882a593Smuzhiyun+++ b/src/bin/keactrl/kea-dhcp4.conf.pre 41*4882a593Smuzhiyun@@ -252,7 +252,7 @@ 42*4882a593Smuzhiyun // // of all devices serviced by Kea, including their identifiers 43*4882a593Smuzhiyun // // (like MAC address), their location in the network, times 44*4882a593Smuzhiyun // // when they were active etc. 45*4882a593Smuzhiyun- // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", 46*4882a593Smuzhiyun+ // "library": "$libdir/kea/hooks/libdhcp_legal_log.so", 47*4882a593Smuzhiyun // "parameters": { 48*4882a593Smuzhiyun // "path": "/var/lib/kea", 49*4882a593Smuzhiyun // "base-name": "kea-forensic4" 50*4882a593Smuzhiyun@@ -269,7 +269,7 @@ 51*4882a593Smuzhiyun // // of specific options or perhaps even a combination of several 52*4882a593Smuzhiyun // // options and fields to uniquely identify a client. Those scenarios 53*4882a593Smuzhiyun // // are addressed by the Flexible Identifiers hook application. 54*4882a593Smuzhiyun- // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so", 55*4882a593Smuzhiyun+ // "library": "$libdir/kea/hooks/libdhcp_flex_id.so", 56*4882a593Smuzhiyun // "parameters": { 57*4882a593Smuzhiyun // "identifier-expression": "relay4[2].hex" 58*4882a593Smuzhiyun // } 59