From 34e8ae4474ee4359debf6a5335839e0a29939249 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Tue, 27 Dec 2022 13:38:41 +0100 Subject: [PATCH] ensure middlewared isn't restarted when not needed --- includes/patch.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/patch.sh b/includes/patch.sh index cecbf90d..4e7b1b28 100755 --- a/includes/patch.sh +++ b/includes/patch.sh @@ -3,10 +3,10 @@ patchv22120(){ echo "Applying 22.12 HotPatch 1" -( wget -q -P /tmp https://github.com/truecharts/truetool/raw/main/hotpatch/2212/HP1.patch && echo "download completed" || echo "download failed" ) && ( patch -N -s -p0 -d /usr/lib/python3/dist-packages/middlewared/ &>/dev/null < /tmp/HP1.patch && echo "patch completed" || echo "Patch Already Applied" ) && rm -rf /tmp/HP1.patch +( wget -q -P /tmp https://github.com/truecharts/truetool/raw/main/hotpatch/2212/HP1.patch && echo "download completed" || echo "download failed" ) && ( patch -N -s -p0 -d /usr/lib/python3/dist-packages/middlewared/ &>/dev/null < /tmp/HP1.patch && restartmiddleware=yes && echo "patch completed" || echo "Patch Already Applied" ) && rm -rf /tmp/HP1.patch echo "Applying 22.12 HotPatch 2" -( wget -q -P /tmp https://github.com/truecharts/truetool/raw/main/hotpatch/2212/HP2.patch && echo "download completed" || echo "download failed" ) && ( patch -N -s -p0 -d /usr/lib/python3/dist-packages/middlewared/ &>/dev/null < /tmp/HP2.patch && echo "patch completed" || echo "Patch Already Applied" ) && rm -rf /tmp/HP2.patch +( wget -q -P /tmp https://github.com/truecharts/truetool/raw/main/hotpatch/2212/HP2.patch && echo "download completed" || echo "download failed" ) && ( patch -N -s -p0 -d /usr/lib/python3/dist-packages/middlewared/ &>/dev/null < /tmp/HP2.patch && restartmiddleware=yes && echo "patch completed" || echo "Patch Already Applied" ) && rm -rf /tmp/HP2.patch } export -f patchv22120 @@ -18,7 +18,6 @@ echo "Starting hotpatcher..." restartmiddleware=no if (( "$scaleVersion" == 22120 )); then patchv22120 - restartmiddleware=yes else echo "No hotpatch available for your version, congratulations!" fi