changeset 952:b8ad676b3c0c draft

Merge commit '40af6cb0b04cc5c938fc0212d8b9bbc91bedc716'
author Nick <nick@somerandomnick.ano>
date Thu, 14 Jun 2012 17:32:50 +0000
parents 675f5d3a0390 (current diff) 1ec03f851ccf (diff)
children f95b4af563e6
files
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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(){