X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=main.c;h=c5e8e67b2f66dfa5e3e16d31e34a0c33a42e6c88;hb=8714f17ad66fa29383170ad45b9c150b9818dbdf;hp=43ec24fde9f48f7394ec218f0abde82688e5eb9a;hpb=e3dc49a34fdd0dd900271cdfe6bb1c05babe5ee6;p=project%2Fnetifd.git

diff --git a/main.c b/main.c
index 43ec24f..c5e8e67 100644
--- a/main.c
+++ b/main.c
@@ -24,9 +24,12 @@
 #include "config.h"
 #include "system.h"
 #include "interface.h"
+#include "wireless.h"
+#include "proto.h"
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
+const char *config_path = DEFAULT_CONFIG_PATH;
 const char *resolv_conf = DEFAULT_RESOLV_CONF;
 static char **global_argv;
 
@@ -235,6 +238,7 @@ static int usage(const char *progname)
 		" -d <mask>:		Mask for debug messages\n"
 		" -s <path>:		Path to the ubus socket\n"
 		" -p <path>:		Path to netifd addons (default: %s)\n"
+		" -c <path>:		Path to UCI configuration\n"
 		" -h <path>:		Path to the hotplug script\n"
 		" -r <path>:		Path to resolv.conf\n"
 		" -l <level>:		Log output level (default: %d)\n"
@@ -284,7 +288,7 @@ int main(int argc, char **argv)
 
 	global_argv = argv;
 
-	while ((ch = getopt(argc, argv, "d:s:p:h:r:l:S")) != -1) {
+	while ((ch = getopt(argc, argv, "d:s:p:c:h:r:l:S")) != -1) {
 		switch(ch) {
 		case 'd':
 			debug_mask = strtoul(optarg, NULL, 0);
@@ -295,6 +299,9 @@ int main(int argc, char **argv)
 		case 'p':
 			main_path = optarg;
 			break;
+		case 'c':
+			config_path = optarg;
+			break;
 		case 'h':
 			hotplug_cmd_path = optarg;
 			break;
@@ -325,6 +332,9 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	proto_shell_init();
+	wireless_init();
+
 	if (system_init()) {
 		fprintf(stderr, "Failed to initialize system control\n");
 		return 1;