Merge pull request #140 from sudomesh/fixmeshonboot

Fix mesh on boot
sudomesh · Oct 24, 2018 · 7281075 · 7281075
2 parents 538deee + 530a792
commit 7281075
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/files/opt/mesh/autoconf b/files/opt/mesh/autoconf
@@ -160,6 +160,9 @@ sed -i -e "s/<ins.ert.mes.hip>/$MESHIP/g" /root/config_succeeded
 /etc/init.d/meshrouting enable 
 /etc/init.d/babeld enable 
 
+# kill cron job
+sed -i '/retrieve_ip/d' /etc/crontabs/root
+
 echo "node reconfigured with mesh IP "$MESHIP
 echo "if running manually, please reboot to apply changes"
 

diff --git a/files/opt/mesh/retrieve_ip b/files/opt/mesh/retrieve_ip
@@ -66,13 +66,5 @@ echo "recieved mesh block:" $MESHBLOCK"/26" >>$LOG
 
 # complete rest of configurations in a reusable script
 /opt/mesh/autoconf $MESHIP
-
-# start some services
-/etc/init.d/babeld start
-/etc/init.d/meshrouting start
-
-# remove cron job, set to reboot, and delete this script 
-echo "deleting cronjob, removing /opt/mesh/retrieve_ip, and rebooting" >>$LOG
-sed -i '/retrieve_ip/d' /etc/crontabs/root
+echo "rebooting" >>$LOG
 reboot -d 10
-rm -- "$0"