free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deprecate avahi-autoipd

This commit is contained in:
Bob Mottram 2018-01-15 12:29:06 +00:00
parent fd34c17159
commit 5b8cc8d6a8
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-client
View File

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

4
src/freedombone-image-customise
View File

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

3
src/freedombone-mesh-batman
View File

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

2
src/freedombone-mesh-install
View File

@ -92,7 +92,7 @@ function show_help {
} }
function mesh_avahi { function mesh_avahi {
$CHROOT_PREFIX apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-dnsconfd
decarray=( 1 2 3 4 5 6 7 8 9 0 ) decarray=( 1 2 3 4 5 6 7 8 9 0 )
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]} 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]}

2
src/freedombone-utils-avahi
View File

@ -55,7 +55,7 @@ function create_avahi_service {
} }
function mesh_avahi { function mesh_avahi {
chroot "$rootdir" apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd chroot "$rootdir" apt-get -yq install avahi-utils avahi-dnsconfd
decarray=( 1 2 3 4 5 6 7 8 9 0 ) decarray=( 1 2 3 4 5 6 7 8 9 0 )
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]} 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]}

2
src/freedombone-utils-setup
View File

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