From c10d2ade06e039b9063edb5c1105b9a43e773642 Mon Sep 17 00:00:00 2001
From: Mirza Krak <mirza.krak@northern.tech>
Date: Thu, 8 Aug 2019 08:25:53 +0000
Subject: [PATCH] fix variable expansions for /etc/mender/servert.crt path

Currently the code expands to the following in mender.conf:

     /mender-convert/output/sdimg/primary/etc/mender/server.crt

${primary_dir} should be dropped from assignment

Fixes: d5e861b052e5 ("add ServerCertificate entry in mender.conf if servert.crt was installed")

Changelog: None

Signed-off-by: Mirza Krak <mirza.krak@northern.tech>
---
 convert-stage-4.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/convert-stage-4.sh b/convert-stage-4.sh
index a6b7498..d52a59d 100755
--- a/convert-stage-4.sh
+++ b/convert-stage-4.sh
@@ -206,7 +206,7 @@ install_files() {
   fi
 
   if [ -e "${primary_dir}/${sysconfdir}/server.crt" ]; then
-    jq_inplace '.ServerCertificate = \"'${primary_dir}'/'${sysconfdir}'/server.crt\"' ${primary_dir}/${sysconfdir}/mender.conf
+    jq_inplace '.ServerCertificate = \"/'${sysconfdir}'/server.crt\"' ${primary_dir}/${sysconfdir}/mender.conf
   fi
 }