[538-kea-should-not-store-anything-in-var-kea-lsb-violation] Addressed comments ...

diff --git a/Makefile.am b/Makefile.am
index edda59f94e7f359ca20c967677eb3cc2f1adbfc1..4c55349658782622dec85992b9770682db49841d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,8 @@ gen-docs:
 # These steps are necessary during installation
 install-exec-hook:
        mkdir -p $(DESTDIR)${localstatedir}/log/
-       mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+       mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
+       mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
 
 EXTRA_DIST  = tools/path_replacer.sh
 EXTRA_DIST += tools/mk_cfgrpt.sh

diff --git a/doc/examples/kea4/hooks.json b/doc/examples/kea4/hooks.json
index c8486ef0629ed14f0e020d33698bddf350e2f4cb..9006c7661ee70d57ddb58e5fb91ab4c68e0267c6 100644 (file)
--- a/doc/examples/kea4/hooks.json
+++ b/doc/examples/kea4/hooks.json
@@ -39,7 +39,7 @@
      {
          "library": "/opt/lib/charging.so",
          "parameters": {
-             "path": "/var/kea/var",
+             "path": "/var/lib/kea",
              "base-name": "kea-forensic6"
          }
      }

diff --git a/doc/examples/kea6/hooks.json b/doc/examples/kea6/hooks.json
index 046751f230f58ec00b1cfd2a1a82221ce0c1e73f..a930e2e9ba98f06671c4d3858904651f12facd54 100644 (file)
--- a/doc/examples/kea6/hooks.json
+++ b/doc/examples/kea6/hooks.json
@@ -47,7 +47,7 @@
      {
         "library": "/opt/lib/charging.so",
         "parameters": {
-             "path": "/var/kea/var",
+             "path": "/var/lib/kea",
              "base-name": "kea-forensic6"
         }
      }

diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
index 60d396e242a8e65033b16ea88f845981346ffef2..ccfdba53f69f975936c65ebe1e78ff1fb6940361 100644 (file)
--- a/src/bin/keactrl/kea-dhcp4.conf.pre
+++ b/src/bin/keactrl/kea-dhcp4.conf.pre
@@ -254,7 +254,7 @@
     //      // when they were active etc.
     //      "library": "@libdir@/kea/hooks/libdhcp_legal_log.so"
     //      "parameters": {
-    //          "path": "/var/kea/var",
+    //          "path": "/var/lib/kea",
     //          "base-name": "kea-forensic4"
     //      }
     //  },

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index bffcecf69db9da7fc944cf60bd08a3ad128066f7..3953b3e6ced47ca3d0a8c1e5d726a7c963bc0082 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -72,8 +72,8 @@ class LFCSetup;
 /// parameter in the database access string. The [path] is the
 /// absolute path to the file (including file name). If this parameter
 /// is not specified, the default location in the installation
-/// directory is used: var/kea/kea-leases4.csv and
-/// var/kea/kea-leases6.csv.
+/// directory is used: <install-dir>/var/lib/kea/kea-leases4.csv and
+/// <install-dir>/var/lib/kea/kea-leases6.csv.
 class Memfile_LeaseMgr : public LeaseMgr {
 public: