aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/main.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-04-23 14:38:57 (GMT)
committerJouni Malinen <j@w1.fi>2013-04-23 14:38:57 (GMT)
commite6304cad47251e88d073553042f1ea7805a858d1 (patch)
tree35560a03a51b8996c186b5a41053cfede366ae68 /wpa_supplicant/main.c
parentadc96dc2ad3b9eeeb79ea817dd00f01b97f4073a (diff)
downloadhostap-e6304cad47251e88d073553042f1ea7805a858d1.zip
hostap-e6304cad47251e88d073553042f1ea7805a858d1.tar.gz
hostap-e6304cad47251e88d073553042f1ea7805a858d1.tar.bz2
wpa_supplicant: Add option -I for additional config file
This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'wpa_supplicant/main.c')
-rw-r--r--wpa_supplicant/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 19f7ce6..1744620 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -32,7 +32,8 @@ static void usage(void)
" [-o<override driver>] [-O<override ctrl>] \\\n"
" [-N -i<ifname> -c<conf> [-C<ctrl>] "
"[-D<driver>] \\\n"
- " [-p<driver_param>] [-b<br_ifname>] ...]\n"
+ " [-p<driver_param>] [-b<br_ifname>] [-I<config file>] "
+ "...]\n"
"\n"
"drivers:\n",
wpa_supplicant_version, wpa_supplicant_license);
@@ -50,6 +51,7 @@ static void usage(void)
" -c = Configuration file\n"
" -C = ctrl_interface parameter (only used if -c is not)\n"
" -i = interface name\n"
+ " -I = additional configuration file\n"
" -d = increase debugging verbosity (-dd even more)\n"
" -D = driver name (can be multiple drivers: nl80211,wext)\n"
" -e = entropy file\n");
@@ -155,7 +157,7 @@ int main(int argc, char *argv[])
for (;;) {
c = getopt(argc, argv,
- "b:Bc:C:D:de:f:g:hi:KLNo:O:p:P:qsTtuvW");
+ "b:Bc:C:D:de:f:g:hi:I:KLNo:O:p:P:qsTtuvW");
if (c < 0)
break;
switch (c) {
@@ -202,6 +204,9 @@ int main(int argc, char *argv[])
case 'i':
iface->ifname = optarg;
break;
+ case 'I':
+ iface->confanother = optarg;
+ break;
case 'K':
params.wpa_debug_show_keys++;
break;