Bob Mottram 7 lat temu
rodzic
commit
057c1389cc
2 zmienionych plików z 3 dodań i 2 usunięć
  1. 2
    1
      src/freedombone-app-batman
  2. 1
    1
      src/freedombone-image-customise

+ 2
- 1
src/freedombone-app-batman Wyświetl plik

@@ -139,7 +139,7 @@ function mesh_install_batman {
139 139
 
140 140
 function install_mesh_tunnel {
141 141
     # https://sudoroom.org/wiki/Mesh/Relay_setup
142
-    chroot "$rootdir" apt-get -yq install xl2tpd l2tpns
142
+    chroot "$rootdir" apt-get -yq install xl2tpd l2tpns libnl-3-dev libnl-3-200
143 143
     chroot "$rootdir" apt-get -yq install iproute bridge-utils libnetfilter-conntrack3 python-dev libevent-dev ebtables python-pip git
144 144
 
145 145
     git clone https://github.com/wlanslovenija/tunneldigger $rootdir/opt/tunneldigger
@@ -147,6 +147,7 @@ function install_mesh_tunnel {
147 147
         echo $'Unable to clone tunneldigger repo'
148 148
         exit 1987453
149 149
     fi
150
+    sed -i 's|-I. |-I. -I/usr/include/libnl3 |g' $rootdir/opt/tunneldigger/client/Makefile
150 151
     echo '#!/bin/bash' > $rootdir/opt/tunneldigger/buildtunnel.sh
151 152
     echo 'cd /opt/tunneldigger/client' >> $rootdir/opt/tunneldigger/buildtunnel.sh
152 153
     echo 'make' >> $rootdir/opt/tunneldigger/buildtunnel.sh

+ 1
- 1
src/freedombone-image-customise Wyświetl plik

@@ -632,7 +632,7 @@ initialise_mesh() {
632 632
     configure_firewall
633 633
     install_avahi
634 634
     install_batman
635
-    install_mesh_tunnel
635
+    #install_mesh_tunnel
636 636
     install_tomb
637 637
     #install_tahoelafs
638 638
     #install_librevault