wireless: defer init until after command line option processing

[project/netifd.git] / main.c

diff --git a/main.c b/main.c
index d8cb17f..fb6deed 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "system.h"
 #include "interface.h"
 #include "config.h"
 #include "system.h"
 #include "interface.h"

+#include "wireless.h"

 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;
 
 unsigned int debug_mask = 0;
 const char *main_path = DEFAULT_MAIN_PATH;


@@ -152,7 +153,7 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
                        }
                }
                if (proc->dir_fd >= 0)
                        }
                }
                if (proc->dir_fd >= 0)

-                       fchdir(proc->dir_fd);
+                       if (fchdir(proc->dir_fd)) {}

 
                close(pfds[0]);
 
 
                close(pfds[0]);
 


@@ -325,6 +326,8 @@ int main(int argc, char **argv)
                return 1;
        }
 
                return 1;
        }
 

+       wireless_init();
+

        if (system_init()) {
                fprintf(stderr, "Failed to initialize system control\n");
                return 1;
        if (system_init()) {
                fprintf(stderr, "Failed to initialize system control\n");
                return 1;