Merge pull request #426 from glaszig/conflict-free-config

handle configuration in a conflict-free way
This commit is contained in:
Bill Zimmerman
2019-11-06 10:35:06 +01:00
committed by GitHub
5 changed files with 56 additions and 0 deletions

View File

@@ -229,6 +229,10 @@ function default_configuration() {
sudo cp $webroot_dir/config/dnsmasq.conf /etc/dnsmasq.conf || install_error "Unable to move dnsmasq configuration file"
sudo cp $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || install_error "Unable to move dhcpcd configuration file"
if [ ! -f "$webroot_dir/includes/config.php" ]; then
sudo cp "$webroot_dir/config/config.php" "$webroot_dir/includes/config.php"
fi
# Generate required lines for Rasp AP to place into rc.local file.
# #RASPAP is for removal script
lines=(