Browse Source

Merge pull request #385 from lluiscampos/MEN-5086-symlink-mender-monitor

MEN-5086: Create mender-monitor state directory
change-dependabot-prefix
Lluis Campos 3 years ago
committed by GitHub
parent
commit
5178246da3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      mender-convert-modify
  2. 2
      tests/mender-image-tests

10
mender-convert-modify

@ -163,12 +163,14 @@ if [ "${MENDER_ADDON_CONFIGURE_INSTALL}" = "y" ]; then
deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/" deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/"
fi fi
# Do this unconditionally even if not installing mender-configure. The reason is # Do this unconditionally even if not installing add-ons. The reason is that if
# that if the Debian package is installed later, this folder has to preexist. It # the Debian package is installed later, this folder has to preexist. It is part
# is part of the rootfs setup, independently of the software. # of the rootfs setup, independently of the software.
log_info "Creating the Mender Configure state folder in the data partition" 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 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 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 if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
# Check for known U-Boot problems in all files on the boot partition. # Check for known U-Boot problems in all files on the boot partition.

2
tests/mender-image-tests

@ -1 +1 @@
Subproject commit 49f21521304d059408e4416e8361dc3d4542292d Subproject commit 47d645966fb0565bbc88e71125bc38e0865a9e6a
Loading…
Cancel
Save