1 files changed, 54 insertions, 6 deletions

diff --git a/src/sysvinit.c b/src/sysvinit.c
index be7aef8..337b922 100644
--- a/src/sysvinit.c
+++ b/src/sysvinit.c
@@ -240,2 +240,6 @@ enablecomp (struct prog *prog, void *data)
           return 0;
+
+        case pies_comp_ondemand:
+          return prog->v.p.status == status_enabled;
+          
         case pies_comp_powerfail:
@@ -244,3 +248,2 @@ enablecomp (struct prog *prog, void *data)
         case pies_comp_ctrlaltdel:
-        case pies_comp_ondemand:
         case pies_comp_powerfailnow:
@@ -303,2 +306,23 @@ sysvinit_runlevel_setup (int mask, int *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";
@@ -460,2 +484,13 @@ sysvinit_fifo_handler (int fd, void *data)
                     {
+                      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;
@@ -464,2 +499,4 @@ sysvinit_fifo_handler (int fd, void *data)
                         }
+                    }
+                }
               break;
@@ -848,2 +885,11 @@ find_action_parser (const char *action)
 
+static char *
+strupr (char *s)
+{
+  char *p;
+  for (p = s; *p; p++)
+    *p = toupper (*p);
+  return s;
+}
+
 int
@@ -933,4 +979,3 @@ inittab_parse (const char *file)
         {
-          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;
@@ -952,2 +997,6 @@ inittab_parse (const char *file)
 
+      if (strcmp (action, "off") == 0)
+        /* Ignore the entry */
+        continue;
+
       ap = find_action_parser (action);
@@ -955,4 +1004,3 @@ inittab_parse (const char *file)
         {
-          logmsg (LOG_ERR, "%s:%u: %s",
-                  file, line_no, _("unknown action"));
+          logmsg (LOG_ERR, "%s:%u: %s", file, line_no, _("unknown action"));
           err = 1;
@@ -963,3 +1011,3 @@ inittab_parse (const char *file)
       comp->mode = ap->mode;
-      comp->runlevels = grecs_strdup (runlevels);
+      comp->runlevels = grecs_strdup (strupr (runlevels));