=== modified file 'etc/init.d/zsv-logger' --- etc/init.d/zsv-logger 2015-10-21 14:14:59 +0000 +++ etc/init.d/zsv-logger 2014-07-09 08:58:52 +0000 @@ -14,7 +14,7 @@ start() { ebegin "starting $ZSV_LOGGER via runit" - zsh -l -c "zsvgen --all-up -f '$ZSV_LOGGER'" + zsh -l -c "zsvgen -f '$ZSV_LOGGER'" ewaitfile 10 /run/service/$ZSV_LOGGER/supervise/control sv check /run/service/$ZSV_LOGGER eend $? === modified file 'sbin/runsvdirboot' --- sbin/runsvdirboot 2015-10-21 14:14:59 +0000 +++ sbin/runsvdirboot 2014-06-28 14:52:53 +0000 @@ -4,7 +4,6 @@ SVDIR=${1:-${SVDIR:-/run/service}} export SVDIR mkdir -p ${SVDIR} -zsvgen --all-down # close filedescriptors and run runsvdir with some place to log exec <& - >& - 2>& - \ runsvdir -P ${SVDIR} \ === modified file 'sbin/zsvgen' --- sbin/zsvgen 2015-10-21 14:14:59 +0000 +++ sbin/zsvgen 2014-10-10 13:16:24 +0000 @@ -5,8 +5,6 @@ zparseopts -D \ h=H -help=H \ - -all-up=ALL_UP \ - -all-down=ALL_DOWN \ f+:=F -filter+:=F if [[ -n $H ]]; then cat < $zsv_control fi else + link=0 touch $zsv_dir/down if [[ -p $zsv_control ]]; then echo -n d > $zsv_control @@ -120,9 +113,10 @@ rm -rf $zsv_dir/log fi - # make symlink - [[ -L ${SVDIR}/$name ]] && rm ${SVDIR}/$name - ln -s ../zsv/$name ${SVDIR} + if (($link)); then + [[ -L ${SVDIR}/$name ]] && rm ${SVDIR}/$name + ln -s ../zsv/$name ${SVDIR} + fi done # for name in $svtab; do @@ -141,5 +135,5 @@ (($#broken)) && rm -f $broken # make runsvdir re-read the directories -killall --signal CONT --user ${USER:-root} runsvdir &>/dev/null +killall --signal CONT --user ${USER:-root} runsvdir touch ${SVDIR}/.zsv === modified file 'sbin/zsvwait' --- sbin/zsvwait 2015-10-21 14:14:59 +0000 +++ sbin/zsvwait 2014-05-12 17:56:25 +0000 @@ -3,7 +3,7 @@ setopt extendedglob : ${SVDIR:=${1:-/run/service}} export SVDIR -zsvgen --all-up +zsvgen check_runsv() { while (($#)); do === modified file 'zsh-functions/zsv_fdcount' --- zsh-functions/zsv_fdcount 2015-10-21 14:14:59 +0000 +++ zsh-functions/zsv_fdcount 2014-07-22 23:44:08 +0000 @@ -22,18 +22,16 @@ fddest=$(zstat -L +link $fdlink) || continue (( $+seen[$fddest] )) && continue case $fddest in - (/dev/null) - zsv_fd_counts[null]=$(( ${zsv_fd_counts[null]:-0} + 1 )) - ;; + (/dev/null) inc null;; (/*) zstat -H s $fdlink || continue ftype=$(( [##16] $s[mode] >> 12 )) key=$ftypes[$ftype] - zsv_fd_counts[$key]=$(( ${zsv_fd_counts[$key]:-0} + 1 )) + zsv_fd_counts[$key]=$(( $zsv_fd_counts[$key] + 1 )) ;; (*) key=${fddest%%:*} - zsv_fd_counts[$key]=$(( ${zsv_fd_counts[$key]:-0} + 1 )) + zsv_fd_counts[$key]=$(( $zsv_fd_counts[$key] + 1 )) ;; esac seen[$fddest]=1