java-hsqldb/java-hsqldb-1.8.0.10-specify-su-shell.patch

38 lines
1.9 KiB
Diff
Raw Permalink Normal View History

--- bin/hsqldb 2011-01-29 09:05:58.000000000 +0100
+++ bin/hsqldb-gil 2011-01-29 09:04:33.000000000 +0100
@@ -41,7 +41,7 @@
# use this file.
# This stuff will be ignored by systems that don't use chkconfig.
-# chkconfig: 345 87 13
+# chkconfig: - 87 13
# description: Hsqldb, A High Performance Java Database
# pidfile: /var/run/hsqldb.pid
# config: /etc/sysconfig/hsqldb
@@ -51,7 +51,6 @@
# Provides: HSQLDB-Server
# Required-Start: $syslog $remote_fs $network $named
# Required-Stop:
-# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: HSQLDB-Server
# Description: Hsqldb, A High Performance Java Database Server
@@ -354,7 +353,7 @@
# Some OSes choke if there are newlines in this string.
# N.b.!!! The shell of the -c command is the target user's default
# login shell, so keep this command shell-independent!
- nohup su "$HSQLDB_OWNER" -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 &
+ nohup su "$HSQLDB_OWNER" -s /bin/sh -c "cd '$SERVER_HOME' && echo "'$$'" > '$PIDFILE' && exec '$JAVA_EXECUTABLE' $SERVER_JVMARGS $TLS_SWITCHES -classpath '${SERVER_ADDL_CLASSPATH}${HSQLDB_JAR_PATH}' org.hsqldb.util.MainInvoker org.hsqldb.$TARGET_CLASS $INVOC_ADDL_ARGS" >> "$LOGFILE" 2>&1 &
else
cd "$SERVER_HOME" || {
echo "Failed to cd to '$SERVER_HOME'" 1>&2
@@ -449,7 +448,7 @@
echo "Successful shutdown ${SHUTDOWN_OPTION} (for the $TARGET_CLASS process)!"
exit 0
;;
- restart|restartcompacted)
+ restart|restartcompacted|reload)
STOP_COMMAND=stop
[ "$COMMAND" = restartcompacted ] && STOP_COMMAND=stopcompact
"${INVOC_PATH}"hsqldb $STOP_COMMAND || exit $?