From 833634bb7930b1957754f57a4f7005fc4398ccf2 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Tue, 21 Sep 2021 15:45:33 +0200 Subject: [PATCH] MEN-5086: Create mender-monitor state directory Changelog: Create symlink from `/var/lib/mender-monitor` to `/data/mender-configure` Signed-off-by: Lluis Campos --- mender-convert-modify | 10 ++++++---- tests/mender-image-tests | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mender-convert-modify b/mender-convert-modify index 8022fbe..9b6e8ba 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -163,12 +163,14 @@ if [ "${MENDER_ADDON_CONFIGURE_INSTALL}" = "y" ]; then deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/" fi -# Do this unconditionally even if not installing mender-configure. The reason is -# that if the Debian package is installed later, this folder has to preexist. It -# is part of the rootfs setup, independently of the software. -log_info "Creating the Mender Configure state folder in the data partition" +# Do this unconditionally even if not installing add-ons. The reason is that if +# the Debian package is installed later, this folder has to preexist. It is part +# of the rootfs setup, independently of the software. +log_info "Creating state folder in the data partition for Mender add-ons" run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure" run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure" +run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-monitor" +run_and_log_cmd "sudo ln -sf /data/mender-monitor work/rootfs/var/lib/mender-monitor" if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then # Check for known U-Boot problems in all files on the boot partition. diff --git a/tests/mender-image-tests b/tests/mender-image-tests index 49f2152..47d6459 160000 --- a/tests/mender-image-tests +++ b/tests/mender-image-tests @@ -1 +1 @@ -Subproject commit 49f21521304d059408e4416e8361dc3d4542292d +Subproject commit 47d645966fb0565bbc88e71125bc38e0865a9e6a