3 files changed, 83 insertions, 32 deletions

diff --git a/src/ctl.c b/src/ctl.c
index 0e5ea97..489fc7f 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1877,19 +1877,21 @@ static int
 fun_start (struct json_value *result, struct prog *prog)
 {
-  if (prog->v.p.status == status_disabled)
+  switch (prog->v.p.status)
     {
+    case status_disabled:
       prog->v.p.comp->flags &= ~CF_DISABLED;
       prog->v.p.status = status_enabled;
       json_object_set_string (result, "status", "OK");
-    }
-  else if (prog->v.p.status == status_sleeping)
-    {
+      break;
+
+    case status_sleeping:
+    case status_finished:
       prog->v.p.status = status_enabled;
       prog->v.p.failcount = 0;
       prog->v.p.timestamp = 0;
       json_object_set_string (result, "status", "OK");
-    }      
-  else
-    {
+      break;
+      
+    default:
       json_object_set_string (result, "status", "ER");
       json_object_set_string (result, "error_message", "already running");
diff --git a/src/progman.c b/src/progman.c
index 4ca3824..020dccd 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -304,7 +304,7 @@ progman_waiting_p ()
       if (IS_COMPONENT (prog) && prog->v.p.wait && prog->pid > 0)
         {
-          debug(1, ("%s: waiting for %s (%lu)",
-                    __FUNCTION__, prog_tag (prog),
-                    (unsigned long) prog->pid));
+          debug (3, ("%s: waiting for %s (%lu)",
+                     __FUNCTION__, prog_tag (prog),
+                     (unsigned long) prog->pid));
           return 1;
         }
@@ -2306,5 +2306,6 @@ progman_cleanup (int expect_term)
           else
             {
-              if (prog->v.p.comp->mode >= pies_mark_sysvinit)
+              if (prog->v.p.comp->mode >= pies_mark_sysvinit
+                  && prog->v.p.comp->mode != pies_comp_ondemand)
                 {
                   sysvinit_acct (SYSV_ACCT_PROC_STOP, "", prog_tag (prog),
diff --git a/src/sysvinit.c b/src/sysvinit.c
index be7aef8..337b922 100644
--- a/src/sysvinit.c
+++ b/src/sysvinit.c
@@ -239,9 +239,12 @@ enablecomp (struct prog *prog, void *data)
         case pies_comp_bootwait:
           return 0;
+
+        case pies_comp_ondemand:
+          return prog->v.p.status == status_enabled;
+          
         case pies_comp_powerfail:
         case pies_comp_powerwait:
         case pies_comp_powerokwait:
         case pies_comp_ctrlaltdel:
-        case pies_comp_ondemand:
         case pies_comp_powerfailnow:
         case pies_comp_kbrequest:
@@ -301,5 +304,26 @@ sysvinit_runlevel_setup (int mask, int *wait)
     *wait = s.wait;
 }
-
+
+static int
+demand_prog (struct prog *prog, void *data)
+{
+  int *rl = data;
+  struct component *comp = prog->v.p.comp;
+  if (comp->mode == pies_comp_ondemand
+      && comp->runlevels
+      && strchr (comp->runlevels, *rl))
+    {
+      prog->v.p.status = status_enabled;
+      debug (1, ("%s: %s", prog_tag (prog), "enabled"));
+    }
+  return 0;
+}
+      
+static void
+sysvinit_demand (int rl)
+{
+  progman_foreach (demand_prog, &rl);
+}
+
 static const char valid_runlevel_arg[] = "0123456789SsQqAaBbCcUu";
 
@@ -459,6 +483,19 @@ sysvinit_fifo_handler (int fd, void *data)
                   if (buf.req.runlevel != runlevel)
                     {
-                      dfl_level = buf.req.runlevel;
-                      inittrans ();
+                      switch (buf.req.runlevel)
+                        {
+                        case 'A':
+                        case 'B':
+                        case 'C':
+                          sysvinit_demand (buf.req.runlevel);
+                          break;
+                          
+                        default:
+                          if (runlevel_index (buf.req.runlevel) != -1)
+                            {
+                              dfl_level = buf.req.runlevel;
+                              inittrans ();
+                            }
+                        }
                     }
                 }
@@ -820,17 +857,17 @@ struct action_parser
 
 static struct action_parser action_tab[] = {
-  { "wait", pies_comp_wait },
-  { "once", pies_comp_once },
-  { "boot", pies_comp_boot },
-  { "bootwait",  pies_comp_bootwait },
-  { "powerfail", pies_comp_powerfail },
-  { "powerwait", pies_comp_powerwait },
-  { "powerokwait", pies_comp_powerokwait },
-  { "ctrlaltdel", pies_comp_ctrlaltdel },       
-  { "ondemand", pies_comp_ondemand },
-  { "sysinit",  pies_comp_sysinit },
+  { "wait",         pies_comp_wait },
+  { "once",         pies_comp_once },
+  { "boot",         pies_comp_boot },
+  { "bootwait",     pies_comp_bootwait },
+  { "powerfail",    pies_comp_powerfail },
+  { "powerwait",    pies_comp_powerwait },
+  { "powerokwait",  pies_comp_powerokwait },
+  { "ctrlaltdel",   pies_comp_ctrlaltdel },     
+  { "ondemand",     pies_comp_ondemand },
+  { "sysinit",      pies_comp_sysinit },
   { "powerfailnow", pies_comp_powerfailnow },
-  { "kbrequest", pies_comp_kbrequest },
-  { "respawn",   pies_comp_respawn },
+  { "kbrequest",    pies_comp_kbrequest },
+  { "respawn",      pies_comp_respawn },
   { NULL }
 };
@@ -847,4 +884,13 @@ find_action_parser (const char *action)
 }
 
+static char *
+strupr (char *s)
+{
+  char *p;
+  for (p = s; *p; p++)
+    *p = toupper (*p);
+  return s;
+}
+
 int
 inittab_parse (const char *file)
@@ -932,6 +978,5 @@ inittab_parse (const char *file)
       if (!id || !runlevels || !action || !process)
         {
-          logmsg (LOG_ERR, "%s:%u: %s",
-                  file, line_no, _("not enough fields"));
+          logmsg (LOG_ERR, "%s:%u: %s", file, line_no, _("not enough fields"));
           err = 1;
           continue;
@@ -951,9 +996,12 @@ inittab_parse (const char *file)
         }
 
+      if (strcmp (action, "off") == 0)
+        /* Ignore the entry */
+        continue;
+
       ap = find_action_parser (action);
       if (!ap)
         {
-          logmsg (LOG_ERR, "%s:%u: %s",
-                  file, line_no, _("unknown action"));
+          logmsg (LOG_ERR, "%s:%u: %s", file, line_no, _("unknown action"));
           err = 1;
           continue;
@@ -962,5 +1010,5 @@ inittab_parse (const char *file)
       comp = component_create (id);
       comp->mode = ap->mode;
-      comp->runlevels = grecs_strdup (runlevels);
+      comp->runlevels = grecs_strdup (strupr (runlevels));
 
       if (wordsplit (process, &ws, WRDSF_DEFFLAGS))