diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-16 10:41:54 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-22 17:13:04 -0700 |
| commit | 64f47c5c24428834677459e048420f86e3514c20 (patch) | |
| tree | 98dea241307f72e8a61925564b997e429d6f3857 /wpa_supplicant/main.c | |
| parent | e93dd11e00aa3a511406648774f01db31304323a (diff) | |
| download | android_external_wpa_supplicant_8-64f47c5c24428834677459e048420f86e3514c20.tar.gz android_external_wpa_supplicant_8-64f47c5c24428834677459e048420f86e3514c20.tar.bz2 android_external_wpa_supplicant_8-64f47c5c24428834677459e048420f86e3514c20.zip | |
wpa_supplicant: Add option -I for additional config file
This option can be used only for global parameters that is not going
to be changed from settings.
Change-Id: I4f18aa0a8503cf8cc3a847ac9fcc15419291edf0
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.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c index 19f7ce66..c3ecbb3d 100644 --- a/wpa_supplicant/main.c +++ b/wpa_supplicant/main.c @@ -32,7 +32,7 @@ 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 +50,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 +156,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 +203,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; |