changeset 882:e26b88d9df75 draft

bugfixes
author d3v11 <d3v11@d3v11.ano>
date Sun, 15 Jan 2012 08:21:58 +0000
parents 07a08fc37688
children f4f941654717
files contrib/peer2anonet/peer2anonet
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/peer2anonet/peer2anonet	Sun Jan 15 03:06:31 2012 +0000
+++ b/contrib/peer2anonet/peer2anonet	Sun Jan 15 08:21:58 2012 +0000
@@ -328,6 +328,16 @@
     [[ $(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
+        chmod +x /etc/rc.local
+    else
+        echo '   fatal error: cannot create reliable startup'
+        exit 1
+    fi
+
     mkdir -p /package
     chmod 1755 /package
     cd /package
@@ -338,16 +348,6 @@
     cd admin/daemontools-0.76
     sed -i 's/gcc/gcc -include errno.h/g' src/conf-cc
     package/install
-    if [ -e /etc/rc.d/rc.local ]; then
-        sed -i "s/exit 0/csh -cf \'\/command\/svscanboot \&\'/" /etc/rc.d/rc.local
-        chmod +x /etc/rc.d/rc.local
-    elif [ -e /etc/rc.local ]; then
-        sed -i "s/exit 0/csh -cf \'\/command\/svscanboot \&\'/" /etc/rc.local
-        chmod +x /etc/rc.local
-    else
-        echo '   fatal error: cannot find rc startup script'
-        exit 1
-    fi
     }
 
 INSTALL_UCSPI_TCP(){