Merge pull request #56 from Hexcles/master

Better support for daemon command line arguments (for Debian).
This commit is contained in:
Max Lv
2014-03-22 17:22:07 +08:00
2 changed files with 4 additions and 1 deletions
+3
View File
@@ -12,6 +12,9 @@ START=yes
# Configuration file
CONFFILE="/etc/shadowsocks/config.json"
# Extra command line arguments
DAEMON_ARGS=""
# User and group to run the server as
USER=root
GROUP=root
+1 -1
View File
@@ -56,7 +56,7 @@ do_start()
start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$GROUP --exec $DAEMON --test > /dev/null \
|| return 1
start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$GROUP --exec $DAEMON -- \
-c "$CONFFILE" -f $PIDFILE \
-c "$CONFFILE" -f $PIDFILE $DAEMON_ARGS \
|| return 2
}