瀏覽代碼

Deprecate avahi-autoipd

Bob Mottram 7 年之前
父節點
當前提交
5b8cc8d6a8

+ 1
- 1
src/freedombone-client 查看文件

@@ -281,7 +281,7 @@ function remove_known_hosts_entries {
281 281
 function setup_avahi_client {
282 282
     echo $'Configuring Avahi'
283 283
     if [ ! -f /usr/bin/pacman ]; then
284
-        sudo apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
284
+        sudo apt-get -yq install avahi-utils avahi-dnsconfd
285 285
     else
286 286
         sudo pacman -S --noconfirm avahi nss-mdns
287 287
         sudo sed -i 's|hosts:.*|hosts: files mdns_minimal [NOTFOUND=return] dns myhostname|g' /etc/nsswitch.conf

+ 2
- 2
src/freedombone-image-customise 查看文件

@@ -1620,7 +1620,7 @@ function image_setup_utils {
1620 1620
     chroot "$rootdir" apt-get -yq install avahi-daemon avahi-utils avahi-discover
1621 1621
     chroot "$rootdir" apt-get -yq install connect-proxy openssh-server
1622 1622
     chroot "$rootdir" apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils
1623
-    chroot "$rootdir" apt-get -yq install avahi-discover avahi-autoipd iptables dnsutils net-tools
1623
+    chroot "$rootdir" apt-get -yq install avahi-discover iptables dnsutils net-tools
1624 1624
     chroot "$rootdir" apt-get -yq install network-manager iputils-ping libnss-mdns libnss-myhostname
1625 1625
     chroot "$rootdir" apt-get -yq install libnss-gw-name nano man ntp locales locales-all debconf
1626 1626
     chroot "$rootdir" apt-get -yq install wireless-tools wpasupplicant usbutils cryptsetup zsh
@@ -1925,7 +1925,7 @@ if [[ $VARIANT != "mesh"* ]]; then
1925 1925
     chroot "$rootdir" apt-get install -y openssh-server
1926 1926
 fi
1927 1927
 chroot "$rootdir" apt-get install -y sudo git dialog build-essential
1928
-chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
1928
+chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover
1929 1929
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager iputils-ping
1930 1930
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name nano man ntp
1931 1931
 chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant usbutils

+ 0
- 3
src/freedombone-mesh-batman 查看文件

@@ -74,8 +74,6 @@ function stop {
74 74
         brctl delbr $BRIDGE
75 75
     fi
76 76
 
77
-    avahi-autoipd -k $BRIDGE
78
-    avahi-autoipd -k $IFACE
79 77
     ifconfig bat0 down -promisc
80 78
 
81 79
     batctl if del $IFACE
@@ -195,7 +193,6 @@ function start {
195 193
     systemctl restart avahi-daemon
196 194
 
197 195
     add_wifi_interface $IFACE $WIFI_SSID ad-hoc $CHANNEL
198
-    avahi-autoipd --force-bind --daemonize --wait $IFACE
199 196
 
200 197
     # NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself
201 198
 

+ 1
- 1
src/freedombone-mesh-install 查看文件

@@ -92,7 +92,7 @@ function show_help {
92 92
 }
93 93
 
94 94
 function mesh_avahi {
95
-    $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
95
+    $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-dnsconfd
96 96
 
97 97
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
98 98
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}

+ 1
- 1
src/freedombone-utils-avahi 查看文件

@@ -55,7 +55,7 @@ function create_avahi_service {
55 55
 }
56 56
 
57 57
 function mesh_avahi {
58
-    chroot "$rootdir" apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
58
+    chroot "$rootdir" apt-get -yq install avahi-utils avahi-dnsconfd
59 59
 
60 60
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
61 61
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}

+ 1
- 1
src/freedombone-utils-setup 查看文件

@@ -263,7 +263,7 @@ function initial_setup {
263 263
     apt-get -yq install cryptsetup libgfshare-bin duplicity sshpass wget avahi-daemon
264 264
     apt-get -yq install avahi-utils avahi-discover connect-proxy openssh-server
265 265
     apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils
266
-    apt-get -yq install avahi-discover avahi-autoipd iptables dnsutils net-tools
266
+    apt-get -yq install avahi-discover iptables dnsutils net-tools
267 267
     apt-get -yq install network-manager iputils-ping libnss-mdns libnss-myhostname
268 268
     apt-get -yq install libnss-gw-name nano man ntp locales locales-all debconf
269 269
     apt-get -yq install wireless-tools wpasupplicant usbutils zsh cpulimit screen