Skip to content

Commit

Permalink
install.sh: remove use of 'set -x' since we handle each statement fai…
Browse files Browse the repository at this point in the history
…lure as needed, retry the partition-table re-read once if needed
  • Loading branch information
msmith626 committed Sep 26, 2024
1 parent f339246 commit 07ae0eb
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ MACOSX="MACOSX"
SYNC_LOCK="/var/lock/conf_sync"
WIPE_TRAN_TYPES="sata|sas|nvme"

# Always bail on any error
set -e

# Optional installation block device path parameter
install_dev="${1}"
# Optional installation device transport type parameter
Expand Down Expand Up @@ -472,7 +469,11 @@ while : ; do
if [ "${this_os}" = "${LINUX}" ]; then
# Re-read the partition table (not fatal)
if ! echo ${dev_node} | grep -E -q 'loop'; then
blockdev --rereadpt ${dev_node}
if ! blockdev --rereadpt ${dev_node}; then
# Might as well retry once
sleep 10
blockdev --rereadpt ${dev_node}
fi
fi
fi
echo
Expand Down

0 comments on commit 07ae0eb

Please sign in to comment.