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