Update init/fedora

The config file should be read after the defaults are set, or the options set in the config file are never used.
This commit is contained in:
iamnos
2012-11-30 21:53:35 +01:00
committed by Ruud
parent 929c6fe3f9
commit 3aabcbf8f1
+5 -5
View File
@@ -11,11 +11,6 @@
# Source function library. # Source function library.
. /etc/init.d/functions . /etc/init.d/functions
# Source couchpotato configuration
if [ -f /etc/sysconfig/couchpotato ]; then
. /etc/sysconfig/couchpotato
fi
prog=couchpotato prog=couchpotato
lockfile=/var/lock/subsys/$prog lockfile=/var/lock/subsys/$prog
@@ -27,6 +22,11 @@ datadir=${CP_DATA-~/.couchpotato}
pidfile=${CP_PIDFILE-/var/run/couchpotato/couchpotato.pid} pidfile=${CP_PIDFILE-/var/run/couchpotato/couchpotato.pid}
## ##
# Source couchpotato configuration
if [ -f /etc/sysconfig/couchpotato ]; then
. /etc/sysconfig/couchpotato
fi
pidpath=`dirname ${pidfile}` pidpath=`dirname ${pidfile}`
options=" --daemon --pid_file=${pidfile} --data_dir=${datadir}" options=" --daemon --pid_file=${pidfile} --data_dir=${datadir}"