--- app-misc/dnetc/files/dnetc.initd.orig 2008-04-10 09:43:10.000000000 +0400 +++ app-misc/dnetc/files/dnetc.initd 2014-04-28 17:00:34.507120326 +0400 @@ -3,7 +3,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-misc/dnetc/files/dnetc.initd,v 1.3 2008/04/10 05:43:10 wolf31o2 Exp $ -opts="${opts} reload fetch flush" +extra_commands="fetch flush" +extra_started_commands="reload" + +description="distributed.net client" +description_flush="flush all output buffers" +description_fetch="fill all input buffers" +description_reload="restart all active clients" depend() { use net @@ -15,9 +21,7 @@ processOpts() { DNETPATH="/opt/distributed.net" DNETBIN="${DNETPATH}/dnetc" - STARTOPTS="--start --chuid dnetc:dnetc --quiet \ - --exec ${DNETBIN}" - + STARTOPTS="--start --user dnetc:dnetc --quiet --exec ${DNETBIN} --name dnetc" DNETOPTS="-quiet" if [ -e /etc/dnetc.ini ] ; then @@ -26,14 +30,14 @@ processOpts() { elif [ -e ${DNETPATH}/dnetc.ini ]; then retVal=0 DNETOPTS="${DNETOPTS} -ini ${DNETPATH}/dnetc.ini" - elif [ ! -z ${EMAIL} ]; then + elif [ ! -z "${EMAIL}" ]; then retVal=0 fi # override ini settings with values in /etc/conf.d/dnetc DNETOPTS="${DNETOPTS} ${EMAIL:+-e ${EMAIL}}" - if [ ! -z ${BUFFER_BASE_DIR} ] ; then + if [ ! -z "${BUFFER_BASE_DIR}" ] ; then local buff_in="${BUFFER_BASE_DIR:+${BUFFER_BASE_DIR}/}buff-in" local buff_out="${BUFFER_BASE_DIR:+${BUFFER_BASE_DIR}/}buff-out" DNETOPTS="${DNETOPTS} -inbase ${buff_in}" @@ -42,8 +46,8 @@ processOpts() { DNETOPTS="${DNETOPTS} ${KEYSERVER_ADDRESS:+-a ${KEYSERVER_ADDRESS}}" # fair group cpu scheduler - uidpath="/sys/kernel/uids/`id -u dnetc`" - [ -d $uidpath ] && echo 2 >$uidpath/cpu_share + local uidpath="/sys/kernel/uids/$(id -u dnetc)" + [ -d "${uidpath}" ] && echo 2 >"${uidpath}"/cpu_share unset uidpath if [ ${retVal} -ne 0 ] ; then @@ -63,14 +67,14 @@ start() { stop() { processOpts || return 1 ebegin "Stopping distributed.net client" - start-stop-daemon --stop --quiet --exec ${DNETBIN} -- + ${DNETBIN} ${DNETOPTS} -shutdown eend ${?} } reload() { processOpts || return 1 ebegin "Reloading distributed.net client" - start-stop-daemon --stop --quiet --signal HUP --exec ${DNETBIN} + ${DNETBIN} ${DNETOPTS} -restart eend ${?} }