omadapi-5.14.26.1-0

* Omada 5.14.26.1 * 45% max memory * minor script update to fix "version" output
GeoffWilliams · Aug 31, 2024 · 67d8448 · 67d8448
1 parent 0ddd60f
commit 67d8448
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/stageomada/10-omada/00-run.sh b/stageomada/10-omada/00-run.sh
@@ -10,9 +10,9 @@ sed -i 's/^#CONF_MAXSWAP=2048/CONF_MAXSWAP=16384/' ${ROOTFS_DIR}/etc/dphys-swapf
 # check for updates here! https://www.tp-link.com/en/support/download/omada-software-controller/
 # Upstream sometimes change the filename supplied to wget after clicking the link so force saving
 # with a consistent output file to prevent apt error: unsupported file ... given on commandline
-OMADA_VERSION="5.13.30.8"
+OMADA_VERSION="5.14.26.1"
 wget -O ${ROOTFS_DIR}/packages/Omada_SDN_Controller_v${OMADA_VERSION}_linux_x64.deb \
-    https://static.tp-link.com/upload/software/2024/202402/20240227/Omada_SDN_Controller_v5.13.30.8_linux_x64.deb
+    https://static.tp-link.com/upload/software/2024/202407/20240710/Omada_SDN_Controller_v5.14.26.1_linux_x64.deb
 
 # own debian package for jsvc
 JSVC_VERSION=1.3.4

diff --git a/stageomada/10-omada/files/control.sh b/stageomada/10-omada/files/control.sh
@@ -28,7 +28,7 @@ JAVA_TOOL="${JRE_HOME}/bin/java"
 # dont operate on /etc/init.d/tpeap as it needs to remain a symlink for the script
 # to work: OMADA_HOME=$(dirname $(dirname $(readlink -f $0)))
 # removed JVM tuning flags from upstream to let Java do its thing...
-JAVA_OPTS="-server -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOG_DIR}/java_heapdump.hprof -Djava.awt.headless=true -XX:MaxRAMPercentage=40"
+JAVA_OPTS="-server -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${LOG_DIR}/java_heapdump.hprof -Djava.awt.headless=true -XX:MaxRAMPercentage=45"
 MAIN_CLASS="com.tplink.smb.omada.starter.OmadaLinuxMain"
 
 OMADA_USER=${OMADA_USER:-omada}
@@ -80,7 +80,7 @@ check_omada_user() {
 }
 
 check_version() {
-    echo "Omada Controller v5.13.22 for Linux (X64)"
+    echo "Omada Controller $(dpkg -l omadac | awk '/^ii / {print $3}') for Linux (X64)"
 }
 
 # root permission check

diff --git a/stageomada/10-omada/files/control.sh.upstream b/stageomada/10-omada/files/control.sh.upstream
@@ -76,7 +76,7 @@ check_omada_user() {
 }
 
 check_version() {
-    echo "Omada Controller v5.13.22 for Linux (X64)"
+    echo "Omada Controller v5.14.26.1 for Linux (X64)"
 }
 
 # root permission check
@@ -273,4 +273,4 @@ elif [ $1 == "status" ]; then
     status
 elif [ $1 == "version" ]; then
     check_version
-fi
+fi