Merge pull request #395 from lluiscampos/2.5.x-MEN-5078-ln-dirs

2.5.x: Modify `ln` calls for data store links to support successive runs

mender-convert-modify

@@ -168,7 +168,8 @@ fi
 # is part of the rootfs setup, independently of the software.
 log_info "Creating the Mender Configure state folder in the data partition"
 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/var/lib"
+run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib"
 
 if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
     # Check for known U-Boot problems in all files on the boot partition.
@@ -275,7 +276,8 @@ if [ -d work/rootfs/boot/dtbs ]; then
 fi
 
 run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender"
-run_and_log_cmd "sudo ln -sf /data/mender work/rootfs/var/lib/mender"
+run_and_log_cmd "sudo mkdir -p work/rootfs/var/lib"
+run_and_log_cmd "sudo ln -sf /data/mender work/rootfs/var/lib"
 
 log_info "Using root device A in mender.conf: $root_part_a_device"
 log_info "Using root device B in mender.conf: $root_part_b_device"