beenull/raspap-webgui-mirror
1
0
Fork 0
mirror of https://github.com/RaspAP/raspap-webgui.git synced 2024-11-22 07:30:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Initialize wpa_supplicant, create if absent. Resolves #452

Browse source
This commit is contained in:
billz 2019-12-13 16:54:01 +00:00
parent 7aad037cf4
commit 78b09cc4b4
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
installers/common.sh
View file

@ -209,6 +209,11 @@ function check_for_old_configs() {
sudo cp /etc/rc.local "$raspap_dir/backups/rc.local.`date +%F-%R`"
sudo ln -sf "$raspap_dir/backups/rc.local.`date +%F-%R`" "$raspap_dir/backups/rc.local"
fi
if [ -f /etc/wpa_supplicant/wpa_supplicant.conf ]; then
sudo cp /etc/wpa_supplicant/wpa_supplicant.conf "$raspap_dir/backups/wpa_supplicant.conf.`date +%F-%R`"
sudo ln -sf "$raspap_dir/backups/wpa_supplicant.conf.`date +%F-%R`" "$raspap_dir/backups/wpa_supplicant.conf"
fi
}
# Move configuration file to the correct location
@ -343,9 +348,26 @@ function patch_system_files() {
install_log "Sudoers file already patched"
fi
# add symlink to prevent wpa_cli cmds from breaking with multiple wlan interfaces
# Add symlink to prevent wpa_cli cmds from breaking with multiple wlan interfaces
install_log "Symlinked wpa_supplicant hooks for multiple wlan interfaces"
sudo ln -s /usr/share/dhcpcd/hooks/10-wpa_supplicant /etc/dhcp/dhclient-enter-hooks.d/
if [ ! -f /usr/share/dhcpcd/hooks/10-wpa_supplicant ]; then
sudo ln -s /usr/share/dhcpcd/hooks/10-wpa_supplicant /etc/dhcp/dhclient-enter-hooks.d/
fi
# Add ctrl_interface and group to wpa_supplicant, create if absent
install_log "Patching wpa_supplicant.conf"
line="ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev"
if [ ! -f /etc/wpa_supplicant/wpa_supplicant.conf ]; then
echo "Creating wpa_supplicant.conf"
sudo touch /etc/wpa_supplicant/wpa_supplicant.conf || install_error "Unable to create wpa_supplicant.conf"
echo $line | sudo tee /etc/wpa_supplicant/wpa_supplicant.conf || install_error "Unable to write to wpa_supplicant.conf"
fi
if grep "$line" /etc/wpa_supplicant/wpa_supplicant.conf > /dev/null; then
echo "ctrl_interface is OK"
else
sudo sed -i "1 i\$line" /etc/wpa_supplicant/wpa_supplicant.conf || install_error "Unable to write to wpa_supplicant.conf"
echo "Adding line $line"
fi
# Unmask and enable hostapd.service
install_log "Unmasking and enabling hostapd service"