Commit ae292ea5 authored by David Johnson's avatar David Johnson

Ugh, use *LOCKFILE everywhere to ensure we wait.

aarch64 machines are really slow, and the default lockfile-create
timeout of 180s has started to prove insufficient.  The "macros" were
there already just unused in these few cases :(.
parent 205f8c4f
......@@ -54,7 +54,7 @@ fi
# Take our lockfile.
#
echo "*** Getting image lock..."
lockfile-create $IMAGESETUPLOCKFILE
$LOCKFILE $IMAGESETUPLOCKFILE
echo "*** Got image lock, continuing..."
cwd=`pwd`
......@@ -91,7 +91,7 @@ fi
# Release our lockfile.
#
echo "*** Releasing image lock..."
lockfile-remove $IMAGESETUPLOCKFILE
$RMLOCKFILE $IMAGESETUPLOCKFILE
echo "*** Released image lock."
exit 0
......@@ -50,13 +50,13 @@ if [ ${DEFAULT_SECGROUP_ENABLE_SSH_ICMP} -eq 1 ]; then
fi
. $DIRNAME/setup-images-lib.sh
lockfile-create $IMAGESETUPLOCKFILE
$LOCKFILE $IMAGESETUPLOCKFILE
if [ -f $IMAGEUPLOADCMDFILE ]; then
echo "*** Adding Images ..."
. $OURDIR/admin-openrc.sh
. $IMAGEUPLOADCMDFILE
fi
lockfile-remove $IMAGESETUPLOCKFILE
$RMLOCKFILE $IMAGESETUPLOCKFILE
ARCH=`uname -m`
if [ "$ARCH" = "aarch64" ] ; then
......
......@@ -37,7 +37,7 @@ fi
#
# Take our lockfile.
#
lockfile-create $IMAGESETUPLOCKFILE
$LOCKFILE $IMAGESETUPLOCKFILE
#
# Create and truncate our upload commands.
......@@ -99,7 +99,7 @@ fi
#
# Release our lockfile.
#
lockfile-remove $IMAGESETUPLOCKFILE
$RMLOCKFILE $IMAGESETUPLOCKFILE
logtend "images"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment