# HG changeset patch # User Nick # Date 1339695170 0 # Node ID b8ad676b3c0ce7008bfe76347c4ba47b10c9670a # Parent 675f5d3a039035150f5fef7da0a0271700738f91# Parent 1ec03f851ccf6b5e52e62df4625a5e3fe9d3a8f3 Merge commit '40af6cb0b04cc5c938fc0212d8b9bbc91bedc716' diff -r 675f5d3a0390 -r b8ad676b3c0c contrib/peer2anonet/peer2anonet --- a/contrib/peer2anonet/peer2anonet Fri Jun 08 20:44:22 2012 +0000 +++ b/contrib/peer2anonet/peer2anonet Thu Jun 14 17:32:50 2012 +0000 @@ -330,12 +330,10 @@ [[ $(echo X`which gcc`) == X ]] && exit 1 [[ $(echo X`which make`) == X ]] && echo ' fatal error: cannot find make' [[ $(echo X`which make`) == X ]] && exit 1 - [[ $(echo X`which csh`) == X ]] && echo ' fatal error: cannot find csh' - [[ $(echo X`which csh`) == X ]] && exit 1 if [ -w /etc/inittab ]; then : elif [ -w /etc/rc.local ] && ! [ -w /etc/inittab ]; then - sed -i "s/exit 0/csh -cf \'\/command\/svscanboot \&\'/" /etc/rc.local + sed -i "s/exit 0/exec \/command\/svscanboot \&/" /etc/rc.local chmod +x /etc/rc.local else echo ' fatal error: cannot create reliable startup' @@ -352,7 +350,7 @@ cd admin/daemontools-0.76 sed -i 's/gcc/gcc -include errno.h/g' src/conf-cc package/install - csh -cf '/command/svscanboot &' + exec /command/svscanboot >/dev/null 2>&1 & } INSTALL_UCSPI_TCP(){