mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-25 09:39:25 +01:00
main: Rename iwd/iwd.conf into iwd/main.conf
This commit is contained in:
parent
20fc857afd
commit
980f6f3645
@ -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 \
|
||||
|
@ -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]
|
||||
|
@ -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]
|
||||
|
@ -1,6 +1,6 @@
|
||||
[SETUP]
|
||||
num_radios=2
|
||||
tmpfs_extra_stuff=iwd.conf
|
||||
tmpfs_extra_stuff=main.conf
|
||||
iwd_config_dir=/tmp
|
||||
|
||||
[HOSTAPD]
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user