netxms/packages-deb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Temporary patch removed

Browse source
This commit is contained in:
Alex Kirhenshtein 2021-05-10 14:53:47 +03:00
parent a8c1d49c44
commit 4388dc0350
No known key found for this signature in database
GPG key ID: BF2366024FEBAC4C
2 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

32
patches/01_nxreportd.patch
View file

@ -1,32 +0,0 @@
commit 2672a0f30c3cbd5ad8a28761dcd837498353d7e5
Author: Alex Kirhenshtein <alk@netxms.org>
Date: Wed May 5 19:53:12 2021 +0300
nxreportd wrapper now works correctly with Debian's multiarch
diff --git a/src/server/nxreportd/nxreportd.in b/src/server/nxreportd/nxreportd.in
index d7eaac3095..c7ff0c9672 100644
--- a/src/server/nxreportd/nxreportd.in
+++ b/src/server/nxreportd/nxreportd.in
@@ -16,6 +16,11 @@ else
fi
###############################################################################
+NXREPORTD_JAR_FILE=~PKGLIBDIR~/java/nxreportd-~PACKAGE_VERSION~.jar
+if [ ! -r $NXREPORTD_JAR_FILE ]; then
+ NXREPORTD_JAR_FILE=$NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar
+fi
+
show_usage_and_exit() {
cat <<END
NetXMS Reporting Server
@@ -93,7 +98,7 @@ if [ -z $JAVA ]; then
fi
if [ "x$DAEMON" = "xyes" ]; then
- nohup $JAVA $JAVA_OPTIONS -jar $NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar >/dev/null 2>/dev/null &
+ nohup $JAVA $JAVA_OPTIONS -jar $NXREPORTD_JAR_FILE >/dev/null 2>/dev/null &
else
- $JAVA $JAVA_OPTIONS -jar $NETXMS_HOME/lib/netxms/java/nxreportd-~PACKAGE_VERSION~.jar
+ $JAVA $JAVA_OPTIONS -jar $NXREPORTD_JAR_FILE
fi

1
patches/series
View file

@ -1 +0,0 @@
01_nxreportd.patch