diff --git a/config/default_hostapd b/config/default_hostapd deleted file mode 100644 index f3549a63..00000000 --- a/config/default_hostapd +++ /dev/null @@ -1,12 +0,0 @@ -# Location of hostapd configuration file -DAEMON_CONF="/etc/hostapd/hostapd.conf" - -# Additional daemon options to be appended to hostapd command:- -# -d show more debug messages (-dd for even more) -# -K include key data in debug messages -# -t include timestamps in some debug messages -# -# Note that -B (daemon mode) and -P (pidfile) options are automatically -# configured by the init.d script and must not be added to DAEMON_OPTS. -# -#DAEMON_OPTS="" diff --git a/installers/common.sh b/installers/common.sh index e012a238..d712f32c 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -368,10 +368,7 @@ function _move_config_file() { function _default_configuration() { if [ "$upgrade" == 0 ]; then _install_log "Applying default configuration to installed services" - if [ -f /etc/default/hostapd ]; then - sudo mv /etc/default/hostapd /tmp/default_hostapd.old || _install_status 1 "Unable to remove old /etc/default/hostapd file" - fi - sudo cp $webroot_dir/config/default_hostapd /etc/default/hostapd || _install_status 1 "Unable to move hostapd defaults file" + sudo cp $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || _install_status 1 "Unable to move hostapd configuration file" sudo cp $webroot_dir/config/090_wlan0.conf $raspap_dnsmasq || _install_status 1 "Unable to move dnsmasq configuration file" sudo cp $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || _install_status 1 "Unable to move dhcpcd configuration file"