浏览代码

Initialise cjdcmd

Bob Mottram 10 年前
父节点
当前提交
8575325d47
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7
    3
      install-freedombone.sh

+ 7
- 3
install-freedombone.sh 查看文件

717
   echo '         echo "cjdroute is already running. Doing nothing..."' >> /etc/init.d/cjdns
717
   echo '         echo "cjdroute is already running. Doing nothing..."' >> /etc/init.d/cjdns
718
   echo '     else' >> /etc/init.d/cjdns
718
   echo '     else' >> /etc/init.d/cjdns
719
   echo '         echo " * Starting cjdroute"' >> /etc/init.d/cjdns
719
   echo '         echo " * Starting cjdroute"' >> /etc/init.d/cjdns
720
-  echo '         /sbin/ip addr add $CJDNS_IP/8 dev cjdroute0' >> /etc/init.d/cjdns
721
-  echo '         /sbin/ip link set mtu 1312 dev cjdroute0' >> /etc/init.d/cjdns
722
-  echo '         /sbin/ip link set cjdroute0 up' >> /etc/init.d/cjdns
723
   echo '         su -c "$PROG_PATH/$PROG < $PROG_PATH/$CJDNS_CONFIG" - $CJDNS_USER' >> /etc/init.d/cjdns
720
   echo '         su -c "$PROG_PATH/$PROG < $PROG_PATH/$CJDNS_CONFIG" - $CJDNS_USER' >> /etc/init.d/cjdns
721
+  echo '         /sbin/ip addr add $CJDNS_IP/8 dev tun0' >> /etc/init.d/cjdns
722
+  echo '         /sbin/ip link set mtu 1312 dev tun0' >> /etc/init.d/cjdns
723
+  echo '         /sbin/ip link set tun0 up' >> /etc/init.d/cjdns
724
+  echo '         /sbin/ip tuntap add mode tun user cjdns dev tun0' >> /etc/init.d/cjdns
724
   echo '     fi' >> /etc/init.d/cjdns
725
   echo '     fi' >> /etc/init.d/cjdns
725
   echo '}' >> /etc/init.d/cjdns
726
   echo '}' >> /etc/init.d/cjdns
726
   echo '' >> /etc/init.d/cjdns
727
   echo '' >> /etc/init.d/cjdns
882
   fi
883
   fi
883
   cp $HOME/projects/go/bin/cjdcmd /usr/bin
884
   cp $HOME/projects/go/bin/cjdcmd /usr/bin
884
 
885
 
886
+  # initialise from the cjdns config
887
+  /usr/bin/cjdcmd cjdnsadmin -file /etc/cjdns/cjdroute.conf
888
+
885
   echo 'install_cjdns_tools' >> $COMPLETION_FILE
889
   echo 'install_cjdns_tools' >> $COMPLETION_FILE
886
 }
890
 }
887
 
891