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