X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=main.c;h=c173cef35be5a840d1d9d5d3b67c3eeab3f0c3b0;hb=d397e8ca5dd492a1fac2e186e2a8b91ac8e463df;hp=f70db54508bbdd30c819afc541d65d8e0b3fba9e;hpb=8aabd47c6f4fefc8fbd70c34a738f7c26956d8cd;p=project%2Fnetifd.git

diff --git a/main.c b/main.c
index f70db54..c173cef 100644
--- a/main.c
+++ b/main.c
@@ -29,6 +29,7 @@
 
 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;
 
@@ -172,9 +173,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 		exit(127);
 	}
 
-	if (pid < 0)
-		goto error;
-
 	close(pfds[1]);
 	proc->uloop.cb = netifd_process_cb;
 	proc->uloop.pid = pid;
@@ -210,22 +208,17 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
 	execvp(global_argv[0], global_argv);
 }
 
-static void netifd_do_reload(struct uloop_timeout *timeout)
+int netifd_reload(void)
 {
-	config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-
-void netifd_reload(void)
-{
-	main_timer.cb = netifd_do_reload;
-	uloop_timeout_set(&main_timer, 100);
+	return config_init_all();
 }
 
 void netifd_restart(void)
 {
-	main_timer.cb = netifd_do_restart;
+	static struct uloop_timeout main_timer = {
+		.cb = netifd_do_restart
+	};
+
 	interface_set_down(NULL);
 	uloop_timeout_set(&main_timer, 1000);
 }
@@ -237,6 +230,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"
@@ -286,7 +280,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);
@@ -297,6 +291,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;