commit 00da14d84a4d277cb5c72b88ba40c74b929311b5
author Konda Reddy Kachana <kkachana@google.com> Fri Jan 26 23:10:30 2024 +0000
committer Konda Reddy Kachana <kkachana@google.com> Sat Jan 27 04:18:30 2024 +0000
tree c4d033250884edf7e827883697cc4f5c256f30b6
parent 496b75a5a03116b65c404d84169a0e197f1c827c

coredump-config: revert race condtion fix.

During the installation, msvfud seems removing the coredump mounts.
Until the root cause identified, reverting
https://gbmc-internal-review.git.corp.google.com/c/meta-google-gbmc/+/168462

Google-Bug-Id: 318749470

Change-Id: Iaee626efb208b464db1422eeff884d4c6598afe3
Signed-off-by: Konda Reddy Kachana <kkachana@google.com>

recipes-google/coredump-config/coredump-config/coredump-config.sh

diff --git a/recipes-google/coredump-config/coredump-config/coredump-config.sh b/recipes-google/coredump-config/coredump-config/coredump-config.sh
index a3626ce..932e4bd 100644
--- a/recipes-google/coredump-config/coredump-config/coredump-config.sh
+++ b/recipes-google/coredump-config/coredump-config/coredump-config.sh
@@ -3,7 +3,7 @@
 MOUNTPOINT="/mnt/luks-mmcblk0_fs"
 COREDUMP_DIR="/var/lib/systemd/coredump"
 TMP_COREDUMP_DIR="/run/systemd/coredumps"
-tmpfs_mounted="false"
+emmc_available="false"
 
 function store_coredumps_in_tmpfs() {
     echo "coredump-config: eMMC is not available, store coredumps in ${TMP_COREDUMP_DIR}." >&2
@@ -11,23 +11,9 @@
     mkdir -p /etc/systemd/coredump.conf.d/
     cp /usr/share/coredump-config/tmpfs-coredump-config.conf /etc/systemd/coredump.conf.d/coredump-config.conf
 
-    umount  "${TMP_COREDUMP_DIR}" || true
+    umount "${COREDUMP_DIR}" || true
     mkdir -p "${COREDUMP_DIR}" "${TMP_COREDUMP_DIR}" || return
-
-    if mount | grep -q "${COREDUMP_DIR}"
-    then
-      mnt_output=$(mount | grep "${COREDUMP_DIR}")
-      fs_type=$(echo "$mnt_output" | awk '{print $5}')
-      if [[ "${fs_type}" == "tmpfs" ]]; then
-          tmpfs_mounted="true"
-      else
-          umount "${COREDUMP_DIR}" || true
-      fi
-    fi
-
-    if [[ "${tmpfs_mounted}" == "false" ]]; then
-        mount -o bind "${TMP_COREDUMP_DIR}" "${COREDUMP_DIR}" || return
-    fi
+    mount -o bind "${TMP_COREDUMP_DIR}" "${COREDUMP_DIR}" || return
     return
 }
 
@@ -37,20 +23,16 @@
     mkdir -p /etc/systemd/coredump.conf.d/
     cp /usr/share/coredump-config/emmc-coredump-config.conf /etc/systemd/coredump.conf.d/coredump-config.conf
 
-    mkdir -p "${COREDUMP_DIR}" "${TMP_COREDUMP_DIR}" || return
-    mkdir -p "${MOUNTPOINT}/coredump" || return
-
     mv -f "${TMP_COREDUMP_DIR}"/*  "${MOUNTPOINT}/coredump/"
+    umount "${COREDUMP_DIR}" || true
+    rm -rf "${TMP_COREDUMP_DIR}"
 
-    if ! mount | grep -q "${COREDUMP_DIR}"
-    then
-        mount -o bind "${TMP_COREDUMP_DIR}" "${COREDUMP_DIR}" || return
-    fi
-
-    mount -o bind "${MOUNTPOINT}/coredump" "${TMP_COREDUMP_DIR}" || return
+    mkdir -p "${MOUNTPOINT}/coredump" "${COREDUMP_DIR}" || return
+    mount -o bind "${MOUNTPOINT}/coredump" "${COREDUMP_DIR}" || return
     return
 }
 
+
 if [[ "${1}" == "emmc" ]];
 then
     echo "coredump-config: Configuring coredump path to eMMC storage." >&2