procd: Make askconsole work again when no tty is specified in inittab

Consider:
::askconsole:/bin/ash --login

askconsole( ) checks for the existance of the tty, but if none is
specified it will skip the remainder of the function. This means
fork_worker( ) is never called and no process is spawned. This
would leave routers without an initial console.

Signed-off-by: Michel Stam <m.stam@fugro.nl>

diff --git a/inittab.c b/inittab.c
index d7bb35ba8d7578b58370f6e15359b820348eb7fb..be1848206bb6f20998470b2b89589f1ec090eab0 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -176,18 +176,23 @@ static void askconsole(struct init_action *a)
                split = strchr(tty, ',');
                if (split != NULL)
                        *split = '\0';
-       }
 
-       if (!dev_exist(tty)) {
-               DEBUG(4, "skipping %s\n", tty);
-               return;
+               if (!dev_exist(tty)) {
+                       DEBUG(4, "skipping %s\n", tty);
+                       return;
+               }
+
+               console = strdup(tty);
+               a->id = strdup(tty);
+       }
+       else {
+               console = NULL;
+               a->id = NULL;
        }
-       console = strdup(tty);
 
        a->tout.cb = respawn;
        for (i = MAX_ARGS - 1; i >= 1; i--)
                a->argv[i] = a->argv[i - 1];
-       a->id = strdup(tty);
        a->argv[0] = ask;
        a->respawn = 500;