1From 06ebd1b2ced426c420ed162980eca194f9f918ae 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 15Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] 16Signed-off-by: Kai Kang <kai.kang@windriver.com> 17 18--- 19 src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- 20 src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- 21 2 files changed, 4 insertions(+), 3 deletions(-) 22 23diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre 24index e6ae8b8..50a3092 100644 25--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre 26+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre 27@@ -51,7 +51,8 @@ 28 // Agent will fail to start. 29 "hooks-libraries": [ 30 // { 31-// "library": "@libdir@/kea/hooks/control-agent-commands.so", 32+// // Replace $libdir with real library path /usr/lib or /usr/lib64 33+// "library": "$libdir/kea/hooks/control-agent-commands.so", 34 // "parameters": { 35 // "param1": "foo" 36 // } 37diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre 38index 6edb8a1..b2a7385 100644 39--- a/src/bin/keactrl/kea-dhcp4.conf.pre 40+++ b/src/bin/keactrl/kea-dhcp4.conf.pre 41@@ -255,7 +255,7 @@ 42 // // of all devices serviced by Kea, including their identifiers 43 // // (like MAC address), their location in the network, times 44 // // when they were active etc. 45- // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", 46+ // "library": "$libdir/kea/hooks/libdhcp_legal_log.so", 47 // "parameters": { 48 // "path": "/var/lib/kea", 49 // "base-name": "kea-forensic4" 50@@ -272,7 +272,7 @@ 51 // // of specific options or perhaps even a combination of several 52 // // options and fields to uniquely identify a client. Those scenarios 53 // // are addressed by the Flexible Identifiers hook application. 54- // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so", 55+ // "library": "$libdir/kea/hooks/libdhcp_flex_id.so", 56 // "parameters": { 57 // "identifier-expression": "relay4[2].hex" 58 // } 59