Merge "Do not install N+1 release unless upgrade in progress"
This commit is contained in:
commit
5635352596
|
@ -34,21 +34,22 @@ echo "Done" >/dev/console
|
||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
# Check whether a second release is installed
|
if [ "$(curl -sf http://pxecontroller:6385/v1/upgrade/$(hostname)/upgrade_in_progress 2>/dev/null)" = "true" ]; then
|
||||||
. /etc/build.info
|
# Check whether a second release is installed
|
||||||
CURRENT_REL_DIR=rel-${SW_VERSION}
|
. /etc/build.info
|
||||||
OTHER_REL_DIR=
|
CURRENT_REL_DIR=rel-${SW_VERSION}
|
||||||
for REL_DIR in /var/www/pages/feed/*; do
|
OTHER_REL_DIR=
|
||||||
|
for REL_DIR in /var/www/pages/feed/*; do
|
||||||
if [[ ! $REL_DIR =~ "${SW_VERSION}" ]]; then
|
if [[ ! $REL_DIR =~ "${SW_VERSION}" ]]; then
|
||||||
OTHER_REL_DIR=`basename $REL_DIR`
|
OTHER_REL_DIR=`basename $REL_DIR`
|
||||||
OTHER_REL_VERSION=${OTHER_REL_DIR:4}
|
OTHER_REL_VERSION=${OTHER_REL_DIR:4}
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# If second release is installed, find the latest version of the installer
|
# If second release is installed, find the latest version of the installer
|
||||||
# RPM and install the pxeboot files we require to boot hosts with that release.
|
# RPM and install the pxeboot files we require to boot hosts with that release.
|
||||||
if [ ! -z "$OTHER_REL_DIR" ]; then
|
if [ ! -z "$OTHER_REL_DIR" ]; then
|
||||||
PATCH_RPM=`find /var/www/pages/updates/${OTHER_REL_DIR}/Packages -name 'pxe-network-installer*' | sort -V | tail -1`
|
PATCH_RPM=`find /var/www/pages/updates/${OTHER_REL_DIR}/Packages -name 'pxe-network-installer*' | sort -V | tail -1`
|
||||||
BASE_RPM=`find /var/www/pages/feed/${OTHER_REL_DIR}/Packages -name 'pxe-network-installer*' | sort -V | tail -1`
|
BASE_RPM=`find /var/www/pages/feed/${OTHER_REL_DIR}/Packages -name 'pxe-network-installer*' | sort -V | tail -1`
|
||||||
|
|
||||||
|
@ -75,6 +76,7 @@ if [ ! -z "$OTHER_REL_DIR" ]; then
|
||||||
|| report_post_failure_with_msg "Failed to copy pxe-network-installer pxelinux.cfg files"
|
|| report_post_failure_with_msg "Failed to copy pxe-network-installer pxelinux.cfg files"
|
||||||
|
|
||||||
rm -rf $TMP_RPM
|
rm -rf $TMP_RPM
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
|
Loading…
Reference in New Issue