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