diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-13 11:38:22 +0100 | 
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-13 12:20:17 +0100 | 
| commit | 2a5447189d13948b4e052d92c59da9d439feb807 (patch) | |
| tree | 57ef96ecd0c190829e601d848bd624629b569698 | |
| parent | f05f7e554575fcc0720564ebc4703a3811644897 (diff) | |
| download | meta-updater-2a5447189d13948b4e052d92c59da9d439feb807.tar.gz | |
aktualizr: improve secondary config directory logic.
Use -d and warn if directory is invalid.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
| -rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 10 | 
1 files changed, 7 insertions, 3 deletions
| diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 39767d4..61ec786 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
| @@ -70,9 +70,13 @@ do_install_append () { | |||
| 70 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 70 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 
| 71 | install -m 0700 -d ${D}${sysconfdir}/sota/conf.d | 71 | install -m 0700 -d ${D}${sysconfdir}/sota/conf.d | 
| 72 | 72 | ||
| 73 | if [ -n "${SOTA_SECONDARY_CONFIG_DIR}" ] && [ -e "${SOTA_SECONDARY_CONFIG_DIR}" ]; then | 73 | if [ -n "${SOTA_SECONDARY_CONFIG_DIR}" ]; then | 
| 74 | install -m 0700 -d ${D}${sysconfdir}/sota/ecus | 74 | if [ -d "${SOTA_SECONDARY_CONFIG_DIR}" ]; then | 
| 75 | install -m 0644 "${SOTA_SECONDARY_CONFIG_DIR}"/* ${D}${sysconfdir}/sota/ecus/ | 75 | install -m 0700 -d ${D}${sysconfdir}/sota/ecus | 
| 76 | install -m 0644 "${SOTA_SECONDARY_CONFIG_DIR}"/* ${D}${sysconfdir}/sota/ecus/ | ||
| 77 | else | ||
| 78 | bbwarn "SOTA_SECONDARY_CONFIG_DIR is set to an invalid directory (${SOTA_SECONDARY_CONFIG_DIR})" | ||
| 79 | fi | ||
| 76 | fi | 80 | fi | 
| 77 | 81 | ||
| 78 | } | 82 | } | 
