diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-16 12:21:24 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-16 12:21:33 +0100 |
| commit | 41259ca6350cc9e27bd9a69bb7ab76af81262577 (patch) | |
| tree | cd357f6e7e02d02998ba426d5d8a4b14a7d718c1 | |
| parent | 7077fe6dd4208bdbd46940f7923b7d89202c3287 (diff) | |
| parent | 3c6d594e646f6d9427eb1c850ce26430a94051e0 (diff) | |
Merge pull request #5849
3c6d594 contrib/init/bitcoind.openrc: Compatibility with previous OpenRC init script variables (Luke Dashjr)
| -rw-r--r-- | contrib/init/bitcoind.openrc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc index 1f7758c920..b0ac5e31e1 100644 --- a/contrib/init/bitcoind.openrc +++ b/contrib/init/bitcoind.openrc @@ -12,9 +12,11 @@ BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/bitcoin.conf} BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind} BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid} BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-bitcoin} +BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}} BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin} BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind} +BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} +BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="Bitcoin Core Daemon" description="Bitcoin crypto-currency p2p network daemon" @@ -28,7 +30,7 @@ command_args="-pid=\"${BITCOIND_PIDFILE}\" \ required_files="${BITCOIND_CONFIGFILE}" start_stop_daemon_args="-u ${BITCOIND_USER} \ - -N ${BITCOIND_NICE:-0} -w 2000" + -N ${BITCOIND_NICE} -w 2000" pidfile="${BITCOIND_PIDFILE}" retry=60 |