From 3e1cbfa27a9eb2989de6cf7300d77b67f87787e2 Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew.moseley@northern.tech>
Date: Thu, 4 Jun 2020 22:19:23 -0400
Subject: [PATCH 1/3] Fix broken setting of INITRD_IMAGETYPE.

Changelog: None
Signed-off-by: Drew Moseley <drew.moseley@northern.tech>
---
 mender-convert-modify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mender-convert-modify b/mender-convert-modify
index 0017c10..7fb2446 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -120,7 +120,7 @@ if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
   if [ -z "${MENDER_GRUB_INITRD_IMAGETYPE}" ]; then
     initrd_imagetype=$(probe_initrd_in_boot_and_root)
   else
-    kernel_imagetype="${MENDER_GRUB_INITRD_IMAGETYPE}"
+    initrd_imagetype="${MENDER_GRUB_INITRD_IMAGETYPE}"
   fi
 
   cat <<- EOF > work/grub-mender-grubenv-${MENDER_GRUBENV_VERSION}/mender_grubenv_defines

From 042bd1d3ce05dfece674ac86dab25a942a8b6897 Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew.moseley@northern.tech>
Date: Fri, 5 Jun 2020 12:26:23 -0400
Subject: [PATCH 2/3] Fix missed log messages.

Currently this is redirecting stdout to stderr and then writing the
now blank stdout to the log file.  This results in log messages getting
displayed to the screen but missed in the log file.

Changelog: Title
Signed-off-by: Drew Moseley <drew.moseley@northern.tech>
---
 modules/log.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/log.sh b/modules/log.sh
index e22c577..271fc4d 100644
--- a/modules/log.sh
+++ b/modules/log.sh
@@ -32,7 +32,8 @@ function log {
   local -r message="$2"
   local -r timestamp=$(date +"%Y-%m-%d %H:%M:%S")
   local -r script_name="$(basename "$0")"
-  >&2 echo -e "${timestamp} [${level}] [$script_name] ${message}" | tee -a ${log_file}
+  echo -e "${timestamp} [${level}] [$script_name] ${message}" >> ${log_file}
+  >&2 echo -e "${timestamp} [${level}] [$script_name] ${message}"
 }
 
 function local_log_debug {

From 49be51121630640ca6ca2e218e1ff453a86b467e Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew.moseley@northern.tech>
Date: Fri, 5 Jun 2020 12:27:37 -0400
Subject: [PATCH 3/3] Unmount filesystem images before creating full image.

This results in filesystems with fewer fsck failures in some environments.

Changelog: Title
Signed-off-by: Drew Moseley <drew.moseley@northern.tech>
---
 mender-convert-package | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mender-convert-package b/mender-convert-package
index 025394b..0098497 100755
--- a/mender-convert-package
+++ b/mender-convert-package
@@ -23,8 +23,8 @@ PLATFORM_PACKAGE_HOOKS=(platform_package)
 
 function trap_exit() {
   echo "mender-convert-package has finished. Cleaning up..."
-  sudo umount -f work/boot > /dev/null
-  sudo umount -f work/rootfs > /dev/null
+  sudo umount -f work/boot > /dev/null 2>&1 || true
+  sudo umount -f work/rootfs > /dev/null 2>&1 || true
 }
 
 function trap_term() {
@@ -255,6 +255,10 @@ if [ "${MENDER_COPY_BOOT_GAP}" == "y" ]; then
   disk_write_at_offset "${output_dir}/boot-gap.bin" "${img_path}" "1"
 fi
 
+# Unmount filesystem image files
+run_and_log_cmd "sudo umount -f work/boot"
+run_and_log_cmd "sudo umount -f work/rootfs"
+
 # Burn Partitions
 log_info "Writing boot partition image"
 disk_write_at_offset "${boot_part}" "${img_path}" "${boot_part_start}"