| Message ID | 20220612220729.1231925-1-angelo@amarulasolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/3] package/wpa_supplicant: fixing "Invalid configuration line" | expand |
On 13/06/2022 00:07, Angelo Compagnucci wrote: > Default configuration file is wrong for the default compiling options. > > Fixes: > > Successfully initialized wpa_supplicant > Line 1: unknown global field 'ctrl_interface=/var/run/wpa_supplicant'. > Line 1: Invalid configuration line > 'ctrl_interface=/var/run/wpa_supplicant'. > Failed to read or parse configuration '/etc/wpa_supplicant.conf'. > > Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> Applied series to master, thanks. Regards, Arnout > --- > v1 -> v4: > * Enabling the ctrl_interface option when the config option is enabled > > package/wpa_supplicant/wpa_supplicant.conf | 2 +- > package/wpa_supplicant/wpa_supplicant.mk | 7 +++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf > index 1994a6c739..20e9f7f842 100644 > --- a/package/wpa_supplicant/wpa_supplicant.conf > +++ b/package/wpa_supplicant/wpa_supplicant.conf > @@ -1,4 +1,4 @@ > -ctrl_interface=/var/run/wpa_supplicant > +#ctrl_interface=/var/run/wpa_supplicant > ap_scan=1 > > network={ > diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk > index c4cfe03371..14f6a6e271 100644 > --- a/package/wpa_supplicant/wpa_supplicant.mk > +++ b/package/wpa_supplicant/wpa_supplicant.mk > @@ -184,6 +184,12 @@ WPA_SUPPLICANT_DEPENDENCIES += readline > WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE > endif > > +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE),y) > +define WPA_SUPPLICANT_ENABLE_CTRL_IFACE > + sed -i '/ctrl_interface/s/^#//g' $(TARGET_DIR)/etc/wpa_supplicant.conf > +endef > +endif > + > ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) > WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO > define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO > @@ -259,6 +265,7 @@ define WPA_SUPPLICANT_INSTALL_TARGET_CMDS > $(WPA_SUPPLICANT_INSTALL_PASSPHRASE) > $(WPA_SUPPLICANT_INSTALL_DBUS) > $(WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO) > + $(WPA_SUPPLICANT_ENABLE_CTRL_IFACE) > endef > > define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes: > On 13/06/2022 00:07, Angelo Compagnucci wrote: >> Default configuration file is wrong for the default compiling options. >> Fixes: >> Successfully initialized wpa_supplicant >> Line 1: unknown global field 'ctrl_interface=/var/run/wpa_supplicant'. >> Line 1: Invalid configuration line >> 'ctrl_interface=/var/run/wpa_supplicant'. >> Failed to read or parse configuration '/etc/wpa_supplicant.conf'. >> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> Committed to 2022.05.x and 2022.02.x, thanks.
diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf index 1994a6c739..20e9f7f842 100644 --- a/package/wpa_supplicant/wpa_supplicant.conf +++ b/package/wpa_supplicant/wpa_supplicant.conf @@ -1,4 +1,4 @@ -ctrl_interface=/var/run/wpa_supplicant +#ctrl_interface=/var/run/wpa_supplicant ap_scan=1 network={ diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index c4cfe03371..14f6a6e271 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -184,6 +184,12 @@ WPA_SUPPLICANT_DEPENDENCIES += readline WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE),y) +define WPA_SUPPLICANT_ENABLE_CTRL_IFACE + sed -i '/ctrl_interface/s/^#//g' $(TARGET_DIR)/etc/wpa_supplicant.conf +endef +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO @@ -259,6 +265,7 @@ define WPA_SUPPLICANT_INSTALL_TARGET_CMDS $(WPA_SUPPLICANT_INSTALL_PASSPHRASE) $(WPA_SUPPLICANT_INSTALL_DBUS) $(WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO) + $(WPA_SUPPLICANT_ENABLE_CTRL_IFACE) endef define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD
Default configuration file is wrong for the default compiling options. Fixes: Successfully initialized wpa_supplicant Line 1: unknown global field 'ctrl_interface=/var/run/wpa_supplicant'. Line 1: Invalid configuration line 'ctrl_interface=/var/run/wpa_supplicant'. Failed to read or parse configuration '/etc/wpa_supplicant.conf'. Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> --- v1 -> v4: * Enabling the ctrl_interface option when the config option is enabled package/wpa_supplicant/wpa_supplicant.conf | 2 +- package/wpa_supplicant/wpa_supplicant.mk | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)