cleanup debug level handover

Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/initd/preinit.c b/initd/preinit.c
index c5f7ada8020f9e94a172482c189df2b788eaddfc..fb94527d50c002043d8500d17ebae61886e412c7 100644 (file)
--- a/initd/preinit.c
+++ b/initd/preinit.c
@@ -30,12 +30,29 @@
 static struct uloop_process preinit_proc;
 static struct uloop_process plugd_proc;
 
+static void
+check_dbglvl(void)
+{
+       FILE *fp = fopen("/tmp/debug_level", "r");
+       int lvl = 0;
+
+       if (!fp)
+               return;
+       fscanf(fp, "%d", &lvl);
+       fclose(fp);
+       unlink("/tmp/debug_level");
+
+       if (lvl > 0 && lvl < 5)
+               debug = lvl;
+}
+
 static void
 spawn_procd(struct uloop_process *proc, int ret)
 {
        char *wdt_fd = watchdog_fd();
-       char *argv[] = { "/sbin/procd", "-d", "0", NULL };
+       char *argv[] = { "/sbin/procd", NULL};
        struct stat s;
+       char dbg[2];
 
        if (plugd_proc.pid > 0)
                kill(plugd_proc.pid, SIGKILL);
@@ -49,10 +66,12 @@ spawn_procd(struct uloop_process *proc, int ret)
        DEBUG(2, "Exec to real procd now\n");
        if (wdt_fd)
                setenv("WDTFD", wdt_fd, 1);
-       if (debug)
-               snprintf(argv[2], 2, "%d", debug & 0xf);
-       else
-               argv[1] = NULL;
+       check_dbglvl();
+       if (debug > 0) {
+               snprintf(dbg, 2, "%d", debug);
+               setenv("DBGLVL", dbg, 1);
+       }
+
        execvp(argv[0], argv);
 }
 

diff --git a/procd.c b/procd.c
index 6fb0a72c687e4f1eee7ba748555502625740ba17..ad8028441d597b2c806074b242ee52fa89463605 100644 (file)
--- a/procd.c
+++ b/procd.c
@@ -40,6 +40,12 @@ static int usage(const char *prog)
 int main(int argc, char **argv)
 {
        int ch;
+       char *dbglvl = getenv("DBGLVL");
+
+       if (dbglvl) {
+               debug = atoi(dbglvl);
+               unsetenv("DBGLVL");
+       }
 
        while ((ch = getopt(argc, argv, "d:s:h:")) != -1) {
                switch (ch) {