main: Rename iwd/iwd.conf into iwd/main.conf

This commit is contained in:
Marcel Holtmann 2018-01-29 02:13:41 -08:00
parent 20fc857afd
commit 980f6f3645
8 changed files with 7 additions and 7 deletions

View File

@ -102,7 +102,7 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h \
src_iwd_LDADD = ell/libell-internal.la -ldl 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_iwctl_SOURCES = client/main.c \
client/adapter.c \ client/adapter.c \

View File

@ -1,6 +1,6 @@
[SETUP] [SETUP]
num_radios=2 num_radios=2
tmpfs_extra_stuff=../misc/certs:iwd.conf tmpfs_extra_stuff=../misc/certs:main.conf
iwd_config_dir=/tmp iwd_config_dir=/tmp
[HOSTAPD] [HOSTAPD]

View File

@ -1,6 +1,6 @@
[SETUP] [SETUP]
num_radios=2 num_radios=2
tmpfs_extra_stuff=../misc/certs:iwd.conf tmpfs_extra_stuff=../misc/certs:main.conf
iwd_config_dir=/tmp iwd_config_dir=/tmp
[HOSTAPD] [HOSTAPD]

View File

@ -1,6 +1,6 @@
[SETUP] [SETUP]
num_radios=2 num_radios=2
tmpfs_extra_stuff=iwd.conf tmpfs_extra_stuff=main.conf
iwd_config_dir=/tmp iwd_config_dir=/tmp
[HOSTAPD] [HOSTAPD]

View File

@ -205,7 +205,7 @@ radio_confs=rad0:rad1
# This field is optional. Default: 1 (true) # This field is optional. Default: 1 (true)
#start_iwd=0 #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. # inside of the specified directory.
# This field is optional. Default: /etc/iwd # This field is optional. Default: /etc/iwd
#iwd_config_dir=/etc/iwd #iwd_config_dir=/etc/iwd

View File

@ -37,7 +37,7 @@ Methods void PushButton()
void StartPin(string pin) void StartPin(string pin)
Start WSC in PIN mode. If iwd's WSC configuration Start WSC in PIN mode. If iwd's WSC configuration
indicates that the device does not support a display, 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. used. Contents of pin are ignored in this case.
Otherwise, the pin provided will be utilized. This Otherwise, the pin provided will be utilized. This

View File

@ -249,7 +249,7 @@ int main(int argc, char *argv[])
if (!config_dir) if (!config_dir)
config_dir = CONFIGDIR; 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(); iwd_config = l_settings_new();