julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #280 from truecharts/fixrestart

Browse Source 
ensure middlewared isn't restarted when not needed
This commit is contained in:
Kjeld Schouten-Lebbing 2022-12-27 13:38:55 +01:00 committed by GitHub
commit ae9c7c78bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/patch.sh
View File

@ -3,10 +3,10 @@
patchv22120(){ patchv22120(){
echo "Applying 22.12 HotPatch 1" 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" 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 export -f patchv22120
@ -18,7 +18,6 @@ echo "Starting hotpatcher..."
restartmiddleware=no restartmiddleware=no
if (( "$scaleVersion" == 22120 )); then if (( "$scaleVersion" == 22120 )); then
patchv22120 patchv22120
restartmiddleware=yes
else else
echo "No hotpatch available for your version, congratulations!" echo "No hotpatch available for your version, congratulations!"
fi fi