diff options
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/kea/files/0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch | 39 | ||||
-rw-r--r-- | meta/recipes-connectivity/kea/kea_1.7.10.bb | 3 |
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/kea/files/0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch b/meta/recipes-connectivity/kea/files/0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch new file mode 100644 index 0000000000..ab3fd83946 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 639dc25cdabc9d1846000a542c8cc19158b69994 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Fri, 18 Sep 2020 08:18:08 +0000 | ||
4 | Subject: [PATCH] keactrl.in: create /var/lib/kea and /var/run/kea folder | ||
5 | |||
6 | Create /var/lib/kea and /var/run/kea folder to fix below error: | ||
7 | # keactrl start | ||
8 | INFO/keactrl: Starting /usr/sbin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf | ||
9 | INFO/keactrl: Starting /usr/sbin/kea-dhcp6 -c /etc/kea/kea-dhcp6.conf | ||
10 | INFO/keactrl: Starting /usr/sbin/kea-ctrl-agent -c /etc/kea/kea-ctrl-agent.conf | ||
11 | Unable to use interprocess sync lockfile (No such file or directory): /var/run/kea/logger_lockfile | ||
12 | Service failed: Launch failed: Unable to open PID file '/var/run/kea/kea-ctrl-agent.kea-ctrl-agent.pid' for write | ||
13 | [snip] | ||
14 | ERROR [kea-dhcp4.dhcp4/615.140641792751488] DHCP4_CONFIG_LOAD_FAIL configuration error using file: /etc/kea/kea-dhcp4.conf, reason: Unable to open database: unable to open '/var/lib/kea/kea-leases4.csv' | ||
15 | [snip] | ||
16 | |||
17 | Upstream-Status: Inappropriate [config specific] | ||
18 | |||
19 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
20 | --- | ||
21 | src/bin/keactrl/keactrl.in | 2 ++ | ||
22 | 1 file changed, 2 insertions(+) | ||
23 | |||
24 | diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in | ||
25 | index 12b2b3f..47cf6f9 100644 | ||
26 | --- a/src/bin/keactrl/keactrl.in | ||
27 | +++ b/src/bin/keactrl/keactrl.in | ||
28 | @@ -482,6 +482,8 @@ case ${command} in | ||
29 | # The variables (dhcp4_srv, dhcp6_serv, dhcp_ddns_srv etc) are set in the | ||
30 | # keactrl.conf file that shellcheck is unable to read. | ||
31 | # shellcheck disable=SC2154 | ||
32 | + [ -d @LOCALSTATEDIR@/run/kea ] || mkdir -p @LOCALSTATEDIR@/run/kea | ||
33 | + [ -d @LOCALSTATEDIR@/lib/kea ] || mkdir -p @LOCALSTATEDIR@/lib/kea | ||
34 | run_conditional "dhcp4" "start_server ${dhcp4_srv} -c ${kea_dhcp4_config_file} ${args}" 1 | ||
35 | run_conditional "dhcp6" "start_server ${dhcp6_srv} -c ${kea_dhcp6_config_file} ${args}" 1 | ||
36 | # shellcheck disable=SC2154 | ||
37 | -- | ||
38 | 2.26.2 | ||
39 | |||
diff --git a/meta/recipes-connectivity/kea/kea_1.7.10.bb b/meta/recipes-connectivity/kea/kea_1.7.10.bb index e2560b2399..d3c8834b46 100644 --- a/meta/recipes-connectivity/kea/kea_1.7.10.bb +++ b/meta/recipes-connectivity/kea/kea_1.7.10.bb | |||
@@ -9,6 +9,7 @@ DEPENDS = "boost log4cplus openssl" | |||
9 | 9 | ||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | 11 | http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ |
12 | file://0001-keactrl.in-create-var-lib-kea-and-var-run-kea-folder.patch \ | ||
12 | file://kea-dhcp4.service \ | 13 | file://kea-dhcp4.service \ |
13 | file://kea-dhcp6.service \ | 14 | file://kea-dhcp6.service \ |
14 | file://kea-dhcp-ddns.service \ | 15 | file://kea-dhcp-ddns.service \ |
@@ -46,7 +47,7 @@ do_install_append() { | |||
46 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} | 47 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} |
47 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 48 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
48 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 49 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
49 | ${D}${systemd_system_unitdir}/kea-dhcp*service | 50 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl |
50 | } | 51 | } |
51 | 52 | ||
52 | do_install_append() { | 53 | do_install_append() { |