diff options
| author | Simon Rettberg | 2023-10-11 14:36:03 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-10-11 14:36:03 +0200 |
| commit | 39168a031dd66179d9a53787dc5269d7522c8adc (patch) | |
| tree | ec1acb4906e62d517342aa0dc7222f9102f5b863 | |
| parent | [SSPS] Fix: Don't install Java 11, but default jre (diff) | |
| download | setup-scripts-39168a031dd66179d9a53787dc5269d7522c8adc.tar.gz setup-scripts-39168a031dd66179d9a53787dc5269d7522c8adc.tar.xz setup-scripts-39168a031dd66179d9a53787dc5269d7522c8adc.zip | |
[SSPS] Install dozmod from tar
| -rw-r--r-- | satellit_installer/includes/00-variables.inc | 2 | ||||
| -rw-r--r-- | satellit_installer/includes/50-install_bwSuite_server.inc | 4 | ||||
| -rwxr-xr-x | satellit_installer/static_files/dmsd/opt/dmsd/dmsd.sh | 16 |
3 files changed, 3 insertions, 19 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc index e23b952..a826ad7 100644 --- a/satellit_installer/includes/00-variables.inc +++ b/satellit_installer/includes/00-variables.inc @@ -70,7 +70,7 @@ PACKAGELIST_WITH_RECOMMENDS=" HTTP_BASE="http://files.bwlp.ks.uni-freiburg.de/install/" HTTP_FILES=" db_sat_dump.sql - dmsd.jar + dozmod.tar.gz openslx_tftp.tar.gz pxelinux.0 slx-admin.tar.gz diff --git a/satellit_installer/includes/50-install_bwSuite_server.inc b/satellit_installer/includes/50-install_bwSuite_server.inc index 2b89126..804235e 100644 --- a/satellit_installer/includes/50-install_bwSuite_server.inc +++ b/satellit_installer/includes/50-install_bwSuite_server.inc @@ -2,8 +2,8 @@ install_bwSuite_server() { # $1: directory to install server to echo "# Installing server part of bwSuite... " mkdir -p "$1" || perror "Cannot create $1" - install -m 0644 -p -o root -g root "$BASEDIR/static_files/dmsd.jar" "$1/dmsd.jar" \ - || perror "Could not install dmsd.jar" + tar -x -f -C /opt/dmsd "$BASEDIR/static_files/dozmod.tar.gz" \ + || perror "Could not extract dmsd" chown -R root:root "$1" chmod -R go-w "$1" diff --git a/satellit_installer/static_files/dmsd/opt/dmsd/dmsd.sh b/satellit_installer/static_files/dmsd/opt/dmsd/dmsd.sh deleted file mode 100755 index 04994d3..0000000 --- a/satellit_installer/static_files/dmsd/opt/dmsd/dmsd.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -KB=$( grep ^MemTotal /proc/meminfo | awk '{print $2}' ) -[ -z "$KB" ] && KB=600000 -if [ "$KB" -gt 4096000 ]; then - MB=$(( KB / ( 1024 * 3 ) + 667 )) -else - MB=$(( KB / ( 1024 * 2 ) )) -fi -if [ "$MB" -gt 2000 ] && ! java -version 2>&1 | grep -q '64-Bit'; then - MB=2000 -fi -[ "$MB" -lt 190 ] && MB=190 -[ "$MB" -gt 4500 ] && MB=4500 - -exec java -Xmx${MB}M -jar dmsd.jar |