瀏覽代碼

Use ipv4 with avahi

Bob Mottram 9 年之前
父節點
當前提交
b95e3d4cc7
共有 2 個文件被更改,包括 14 次插入7 次删除
  1. 6
    1
      src/freedombone
  2. 8
    6
      src/freedombone-client

+ 6
- 1
src/freedombone 查看文件

1660
 
1660
 
1661
   # remove an avahi service which isn't used
1661
   # remove an avahi service which isn't used
1662
   if [ -f /etc/avahi/services/udisks.service ]; then
1662
   if [ -f /etc/avahi/services/udisks.service ]; then
1663
-	  rm /etc/avahi/services/udisks.service
1663
+      rm /etc/avahi/services/udisks.service
1664
   fi
1664
   fi
1665
 
1665
 
1666
   systemctl restart avahi-daemon
1666
   systemctl restart avahi-daemon
1688
   echo 'if [[ $1 == "start" ]]; then' >> $babel_script
1688
   echo 'if [[ $1 == "start" ]]; then' >> $babel_script
1689
   echo '    sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
1689
   echo '    sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
1690
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
1690
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
1691
+  echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
1692
+  echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
1693
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal [NOTFOUND=return] dns $(hostname)|g" /etc/nsswitch.conf' >> $babel_script
1691
   echo '    if [ -f /bin/systemctl ]; then' >> $babel_script
1694
   echo '    if [ -f /bin/systemctl ]; then' >> $babel_script
1692
   echo '        systemctl restart avahi-daemon' >> $babel_script
1695
   echo '        systemctl restart avahi-daemon' >> $babel_script
1693
   echo '    else' >> $babel_script
1696
   echo '    else' >> $babel_script
1804
   echo '        echo "error: unable to find wifi interface, not enabling batman-adv mesh"' >> $batman_script
1807
   echo '        echo "error: unable to find wifi interface, not enabling batman-adv mesh"' >> $batman_script
1805
   echo '        return' >> $batman_script
1808
   echo '        return' >> $batman_script
1806
   echo '    fi' >> $batman_script
1809
   echo '    fi' >> $batman_script
1810
+  echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
1811
+  echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
1807
   echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal [NOTFOUND=return] dns $(hostname)|g" /etc/nsswitch.conf' >> $batman_script
1812
   echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal [NOTFOUND=return] dns $(hostname)|g" /etc/nsswitch.conf' >> $batman_script
1808
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
1813
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
1809
   echo '    systemctl stop network-manager' >> $batman_script
1814
   echo '    systemctl stop network-manager' >> $batman_script

+ 8
- 6
src/freedombone-client 查看文件

60
   sudo sed -i "s/#   MACs.*/   MACs $SSH_MACS/g" /etc/ssh/ssh_config
60
   sudo sed -i "s/#   MACs.*/   MACs $SSH_MACS/g" /etc/ssh/ssh_config
61
   if ! grep -q "HostKeyAlgorithms" /etc/ssh/ssh_config; then
61
   if ! grep -q "HostKeyAlgorithms" /etc/ssh/ssh_config; then
62
       sudo cp /etc/ssh/ssh_config ~/ssh_config
62
       sudo cp /etc/ssh/ssh_config ~/ssh_config
63
-	  sudo chown $CURR_USER:$CURR_USER ~/ssh_config
63
+      sudo chown $CURR_USER:$CURR_USER ~/ssh_config
64
       echo "   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS" >> ~/ssh_config
64
       echo "   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS" >> ~/ssh_config
65
       sudo mv ~/ssh_config /etc/ssh/ssh_config
65
       sudo mv ~/ssh_config /etc/ssh/ssh_config
66
-	  sudo chown root:root /etc/ssh/ssh_config
66
+      sudo chown root:root /etc/ssh/ssh_config
67
   fi
67
   fi
68
   sudo sed -i "s/Ciphers.*/Ciphers $SSH_CIPHERS/g" /etc/ssh/ssh_config
68
   sudo sed -i "s/Ciphers.*/Ciphers $SSH_CIPHERS/g" /etc/ssh/ssh_config
69
   if ! grep -q "Ciphers " /etc/ssh/ssh_config; then
69
   if ! grep -q "Ciphers " /etc/ssh/ssh_config; then
70
       sudo cp /etc/ssh/ssh_config ~/ssh_config
70
       sudo cp /etc/ssh/ssh_config ~/ssh_config
71
-	  sudo chown $CURR_USER:$CURR_USER ~/ssh_config
71
+      sudo chown $CURR_USER:$CURR_USER ~/ssh_config
72
       echo "   Ciphers $SSH_CIPHERS" >> ~/ssh_config
72
       echo "   Ciphers $SSH_CIPHERS" >> ~/ssh_config
73
       sudo mv ~/ssh_config /etc/ssh/ssh_config
73
       sudo mv ~/ssh_config /etc/ssh/ssh_config
74
-	  sudo chown root:root /etc/ssh/ssh_config
74
+      sudo chown root:root /etc/ssh/ssh_config
75
   fi
75
   fi
76
   sudo sed -i "s/MACs.*/MACs $SSH_MACS/g" /etc/ssh/ssh_config
76
   sudo sed -i "s/MACs.*/MACs $SSH_MACS/g" /etc/ssh/ssh_config
77
   if ! grep -q "MACs " /etc/ssh/ssh_config; then
77
   if ! grep -q "MACs " /etc/ssh/ssh_config; then
78
       sudo cp /etc/ssh/ssh_config ~/ssh_config
78
       sudo cp /etc/ssh/ssh_config ~/ssh_config
79
-	  sudo chown $CURR_USER:$CURR_USER ~/ssh_config
79
+      sudo chown $CURR_USER:$CURR_USER ~/ssh_config
80
       echo "   MACs $SSH_MACS" >> ~/ssh_config
80
       echo "   MACs $SSH_MACS" >> ~/ssh_config
81
       sudo mv ~/ssh_config /etc/ssh/ssh_config
81
       sudo mv ~/ssh_config /etc/ssh/ssh_config
82
-	  sudo chown root:root /etc/ssh/ssh_config
82
+      sudo chown root:root /etc/ssh/ssh_config
83
   fi
83
   fi
84
 
84
 
85
   # Create ssh keys
85
   # Create ssh keys
179
   echo '    apt-get -y install avahi-utils avahi-autoipd avahi-daemon avahi-dnsconfd' >> $batman_script
179
   echo '    apt-get -y install avahi-utils avahi-autoipd avahi-daemon avahi-dnsconfd' >> $batman_script
180
   echo '    sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
180
   echo '    sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
181
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
181
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
182
+  echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
183
+  echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
182
   echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal [NOTFOUND=return] dns $(hostname)|g" /etc/nsswitch.conf' >> $batman_script
184
   echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal [NOTFOUND=return] dns $(hostname)|g" /etc/nsswitch.conf' >> $batman_script
183
   echo 'fi' >> $batman_script
185
   echo 'fi' >> $batman_script
184
   echo '' >> $batman_script
186
   echo '' >> $batman_script