From 4a543c75f7d419f98dd87ab9f77a92ba5f84a7bd Mon Sep 17 00:00:00 2001 From: Smirnov Artem Date: Thu, 31 May 2018 16:22:45 +0300 Subject: [PATCH] image_builder: use dnsmasq as default dhcp-server (#48) --- image_builder/scripts/network_setup.sh | 48 +++++++++-------------- image_builder/scripts/software_install.sh | 2 +- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/image_builder/scripts/network_setup.sh b/image_builder/scripts/network_setup.sh index af4941af..420be48e 100755 --- a/image_builder/scripts/network_setup.sh +++ b/image_builder/scripts/network_setup.sh @@ -8,10 +8,13 @@ echo -e "\033[0;31m\033[1m$(date) | #1 Write to /etc/wpa_supplicant/wpa_supplica echo " network={ ssid=\"CLEVER\" - mode=2 - key_mgmt=WPA-PSK psk=\"cleverwifi\" - frequency=2437 + mode=2 + proto=RSN + key_mgmt=WPA-PSK + pairwise=CCMP + group=CCMP + auth_alg=OPEN }" >> /etc/wpa_supplicant/wpa_supplicant.conf echo -e "\033[0;31m\033[1m$(date) | #2 Write STATIC to /etc/dhcpcd.conf\033[0m\033[0m" @@ -20,36 +23,23 @@ echo " interface wlan0 static ip_address=192.168.11.1/24" >> /etc/dhcpcd.conf -echo -e "\033[0;31m\033[1m$(date) | #3 Write iface to /etc/default/isc-dhcp-server\033[0m\033[0m" +echo -e "\033[0;31m\033[1m$(date) | #3 Write dhcp-config to /etc/dnsmasq.conf\033[0m\033[0m" -# https://www.shellhacks.com/ru/sed-find-replace-string-in-file/ -sed -i 's/INTERFACESv4=\"\"/INTERFACESv4=\"wlan0\"/' /etc/default/isc-dhcp-server +echo " +interface=wlan0 +address=/clever/coex/192.168.11.1 +dhcp-range=192.168.11.100,192.168.11.200,12h +no-hosts +filterwin2k +bogus-priv +domain-needed +quiet-dhcp6 +" >> /etc/dnsmasq.conf -echo -e "\033[0;31m\033[1m$(date) | #4 Write dhcp declaration subnet to /etc/dhcp/dhcpd.conf\033[0m\033[0m" - -echo "subnet 192.168.11.0 netmask 255.255.255.0 { - range 192.168.11.11 192.168.11.254; - #option domain-name-servers 8.8.8.8; - #option domain-name "rpi.local"; - option routers 192.168.11.1; - option broadcast-address 192.168.11.255; - default-lease-time 600; - max-lease-time 7200; -}" >> /etc/dhcp/dhcpd.conf - -echo -e "\033[0;31m\033[1m$(date) | #5 Write start script for dhcpd to /etc/network/if-up.d/isc-dhcp-server\033[0m\033[0m" - -echo "#!/bin/sh -if [ \"\$IFACE\" = \"--all\" ]; -then sleep 10 && systemctl start isc-dhcp-server.service & -fi -" > /etc/network/if-up.d/isc-dhcp-server \ - && chmod +x /etc/network/if-up.d/isc-dhcp-server - -echo -e "\033[0;31m\033[1m$(date) | #6 Write magic script for rename SSID to /etc/rc.local\033[0m\033[0m" +echo -e "\033[0;31m\033[1m$(date) | #4 Write magic script for rename SSID to /etc/rc.local\033[0m\033[0m" RENAME_SSID="sudo sed -i.OLD \"s/CLEVER/CLEVER-\$(head -c 100 /dev/urandom | xxd -ps -c 100 | sed -e 's/[^0-9]//g' | cut -c 1-4)/g\" /etc/wpa_supplicant/wpa_supplicant.conf && sudo sed -i '/sudo sed/d' /etc/rc.local && sudo reboot" sed -i "19a$RENAME_SSID" /etc/rc.local -echo -e "\033[0;31m\033[1m$(date) | #7 End of network installation\033[0m\033[0m" +echo -e "\033[0;31m\033[1m$(date) | #5 End of network installation\033[0m\033[0m" diff --git a/image_builder/scripts/software_install.sh b/image_builder/scripts/software_install.sh index c06874f1..3b058317 100755 --- a/image_builder/scripts/software_install.sh +++ b/image_builder/scripts/software_install.sh @@ -19,7 +19,7 @@ apt-get install --no-install-recommends -y \ lsof \ python-pip \ git \ - isc-dhcp-server \ + dnsmasq \ tmux \ vim \ ipython3 \