From bc0743fcf8da22c8b9c1e1789b86c5313d287490 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Fri, 8 Oct 2021 17:43:35 +0200 Subject: [PATCH] B #247: Retry CD-ROM mount Closes #247 --- src/usr/sbin/one-contextd | 42 ++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/usr/sbin/one-contextd b/src/usr/sbin/one-contextd index e9da1fd..9aa584e 100755 --- a/src/usr/sbin/one-contextd +++ b/src/usr/sbin/one-contextd @@ -192,24 +192,38 @@ function get_new_context { log debug "Mounting CD-ROM ${dev_context} on ${MOUNT_DIR}" - case "${distro}" in - Linux) - mount -o ro "${dev_context}" "${MOUNT_DIR}" 2>/dev/null - ;; - BSD) - mount_cd9660 "${dev_context}" "${MOUNT_DIR}" 2>/dev/null - ;; - *) - echo "ERROR: Unsupported distro ${distro}" - exit 1 - esac - - if [ "$?" != '0' ]; then + # Retry mounting several times + # https://github.com/OpenNebula/addon-context-linux/issues/247 + _timeout=6 + while [ "$_timeout" -gt 0 ] ; do + case "${distro}" in + Linux) + mount -o ro "${dev_context}" "${MOUNT_DIR}" 2>/dev/null + ;; + BSD) + mount_cd9660 "${dev_context}" "${MOUNT_DIR}" 2>/dev/null + ;; + *) + echo "ERROR: Unsupported distribution - ${distro}" >&2 + exit 1 + esac + + if [ $? -eq 0 ] ;then + _mount_dir_mounted=yes + break + else + # sleep and retry + _timeout=$(( _timeout - 1 )) + log debug "Mount failed (retries left: (${_timeout})" + sleep 1 + fi + done + + if [ "${_timeout}" -eq 0 ] || [ "${_mount_dir_mounted}" != 'yes' ]; then log err "Error: Failed to mount ${dev_context}" 2 exit 1 fi - _mount_dir_mounted=yes context_sh $MOUNT_DIR elif find '/context' -mindepth 1 -print 2>/dev/null | grep -q .; then