diff --git a/Makefile.am b/Makefile.am index 8f4a922d..2b94cb64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,7 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h \ src_iwd_LDADD = ell/libell-internal.la -ldl -dist_sysconf_DATA = src/iwd.conf +dist_sysconf_DATA = src/main.conf client_iwctl_SOURCES = client/main.c \ client/adapter.c \ diff --git a/autotests/testEAP-TLS-Frag/hw.conf b/autotests/testEAP-TLS-Frag/hw.conf index e6ef70b3..e210f674 100644 --- a/autotests/testEAP-TLS-Frag/hw.conf +++ b/autotests/testEAP-TLS-Frag/hw.conf @@ -1,6 +1,6 @@ [SETUP] num_radios=2 -tmpfs_extra_stuff=../misc/certs:iwd.conf +tmpfs_extra_stuff=../misc/certs:main.conf iwd_config_dir=/tmp [HOSTAPD] diff --git a/autotests/testEAP-TTLS-Frag/hw.conf b/autotests/testEAP-TTLS-Frag/hw.conf index 43ebd4cf..f0e55bd6 100644 --- a/autotests/testEAP-TTLS-Frag/hw.conf +++ b/autotests/testEAP-TTLS-Frag/hw.conf @@ -1,6 +1,6 @@ [SETUP] num_radios=2 -tmpfs_extra_stuff=../misc/certs:iwd.conf +tmpfs_extra_stuff=../misc/certs:main.conf iwd_config_dir=/tmp [HOSTAPD] diff --git a/autotests/testEAP-WPS-Frag/hw.conf b/autotests/testEAP-WPS-Frag/hw.conf index 53bd3ac9..ebeade92 100644 --- a/autotests/testEAP-WPS-Frag/hw.conf +++ b/autotests/testEAP-WPS-Frag/hw.conf @@ -1,6 +1,6 @@ [SETUP] num_radios=2 -tmpfs_extra_stuff=iwd.conf +tmpfs_extra_stuff=main.conf iwd_config_dir=/tmp [HOSTAPD] diff --git a/doc/test-runner.txt b/doc/test-runner.txt index 1e45d4c4..0dc28436 100644 --- a/doc/test-runner.txt +++ b/doc/test-runner.txt @@ -205,7 +205,7 @@ radio_confs=rad0:rad1 # This field is optional. Default: 1 (true) #start_iwd=0 -# Configuration directory to use for IWD daemon. IWD expects 'iwd.conf' to be +# Configuration directory to use for IWD daemon. IWD expects 'main.conf' to be # inside of the specified directory. # This field is optional. Default: /etc/iwd #iwd_config_dir=/etc/iwd diff --git a/doc/wsc-api.txt b/doc/wsc-api.txt index 6bc16fe8..3f7059ac 100644 --- a/doc/wsc-api.txt +++ b/doc/wsc-api.txt @@ -37,7 +37,7 @@ Methods void PushButton() void StartPin(string pin) Start WSC in PIN mode. If iwd's WSC configuration indicates that the device does not support a display, - a static PIN from the iwd.conf configuration file is + a static PIN from the main.conf configuration file is used. Contents of pin are ignored in this case. Otherwise, the pin provided will be utilized. This diff --git a/src/main.c b/src/main.c index 0d72c3dd..f0e967e3 100644 --- a/src/main.c +++ b/src/main.c @@ -249,7 +249,7 @@ int main(int argc, char *argv[]) if (!config_dir) config_dir = CONFIGDIR; - config_path = l_strdup_printf("/%s/%s", config_dir, "iwd.conf"); + config_path = l_strdup_printf("/%s/%s", config_dir, "main.conf"); iwd_config = l_settings_new(); diff --git a/src/iwd.conf b/src/main.conf similarity index 100% rename from src/iwd.conf rename to src/main.conf