ソースを参照

Remove batman ipv6 address

Bob Mottram 9 年 前
コミット
552bd5f967
共有2 個のファイルを変更した0 個の追加32 個の削除を含む
  1. 0
    25
      src/freedombone
  2. 0
    7
      src/freedombone-config

+ 0
- 25
src/freedombone ファイルの表示

@@ -378,7 +378,6 @@ CJDNS_PORT=
378 378
 
379 379
 # B.A.T.M.A.N settings
380 380
 ENABLE_BATMAN="no"
381
-BATMAN_IPV6=
382 381
 BATMAN_CELLID='02:BA:00:00:03:01'
383 382
 ESSID='mesh'
384 383
 
@@ -872,9 +871,6 @@ function read_configuration {
872 871
       if grep -q "ENABLE_BATMAN" $CONFIGURATION_FILE; then
873 872
           ENABLE_BATMAN=$(grep "ENABLE_BATMAN" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
874 873
       fi
875
-      if grep -q "BATMAN_IPV6" $CONFIGURATION_FILE; then
876
-          BATMAN_IPV6=$(grep "BATMAN_IPV6" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
877
-      fi
878 874
       if grep -q "ENABLE_CJDNS" $CONFIGURATION_FILE; then
879 875
           ENABLE_CJDNS=$(grep "ENABLE_CJDNS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
880 876
       fi
@@ -1579,16 +1575,6 @@ function mesh_cjdns_tools {
1579 1575
   echo 'mesh_cjdns_tools' >> $COMPLETION_FILE
1580 1576
 }
1581 1577
 
1582
-function get_batman_ipv6_address {
1583
-  if [ -f /home/$MY_USERNAME/README ]; then
1584
-      if grep -q "Mesh internet bridge IP address" /home/$MY_USERNAME/README; then
1585
-          if [ ! $BATMAN_IPV6 ]; then
1586
-              BATMAN_IPV6=$(cat /home/$MY_USERNAME/README | grep "Mesh internet bridge IP address" | awk -F ':' '{print $2}' | sed 's/^ *//')
1587
-          fi
1588
-      fi
1589
-  fi
1590
-}
1591
-
1592 1578
 function install_vpn_tunnel {
1593 1579
   if ! grep -q "repo.universe-factory.net" /etc/apt/sources.list; then
1594 1580
       echo 'deb http://repo.universe-factory.net/debian/ sid main' >> /etc/apt/sources.list
@@ -1727,17 +1713,6 @@ function mesh_batman_bridge {
1727 1713
   fi
1728 1714
 
1729 1715
   enable_ipv6
1730
-  get_batman_ipv6_address
1731
-
1732
-  # If no address has been given then create a ramdom one
1733
-  if [ ! $BATMAN_IPV6 ]; then
1734
-      hexarray=( 1 2 3 4 5 6 7 8 9 0 a b c d e f )
1735
-      a=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
1736
-      b=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
1737
-      c=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
1738
-      d=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
1739
-      BATMAN_IPV6="$IPV6_NETWORK:$a:$b:$c:$d"
1740
-  fi
1741 1716
 
1742 1717
   batman_script=/var/lib/batman
1743 1718
 

+ 0
- 7
src/freedombone-config ファイルの表示

@@ -90,7 +90,6 @@ MEDIAGOBLIN_CODE=
90 90
 USB_DRIVE=/dev/sdb1
91 91
 HWRNG_TYPE=
92 92
 ENABLE_SOCIAL_KEY_MANAGEMENT=
93
-BATMAN_IPV6=
94 93
 
95 94
 CONFIGURATION_FILE=
96 95
 
@@ -232,9 +231,6 @@ function save_configuration_file {
232 231
   if [ $ENABLE_SOCIAL_KEY_MANAGEMENT ]; then
233 232
       echo "ENABLE_SOCIAL_KEY_MANAGEMENT=$ENABLE_SOCIAL_KEY_MANAGEMENT" >> $CONFIGURATION_FILE
234 233
   fi
235
-  if [ $BATMAN_IPV6 ]; then
236
-      echo "BATMAN_IPV6=$BATMAN_IPV6" >> $CONFIGURATION_FILE
237
-  fi
238 234
 }
239 235
 
240 236
 # test a domain name to see if it's valid
@@ -1411,9 +1407,6 @@ function read_configuration {
1411 1407
       if grep -q "ENABLE_BABEL" $CONFIGURATION_FILE; then
1412 1408
           ENABLE_BABEL=$(grep "ENABLE_BABEL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1413 1409
       fi
1414
-      if grep -q "BATMAN_IPV6" $CONFIGURATION_FILE; then
1415
-          BATMAN_IPV6=$(grep "BATMAN_IPV6" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1416
-      fi
1417 1410
       if grep -q "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE; then
1418 1411
           ROUTER_IP_ADDRESS=$(grep "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1419 1412
       fi