Stop disabled components when switching runlevels.

* src/prog.h (status_enabled, status_disabled): Remove.
(status_stopped, status_running): New modes.
All uses updated.
* src/comp.c (component_finish): Disable ondemand component
by default.
* src/ctl.c (json_object_set_bool): New function.
(pies_status_str): Update.
(prog_serialize): Set "disabled" attribute.
(fun_stop, fun_start): Use CF_DISABLED flag.
(res_runlevel): Schedule ACTION_RELOAD.
* src/pies.h (json_object_set_bool): New proto.
* src/piesctl.c (status_trans): Reflect changes in modes.
(print_comp): Check the "disabled" attribute.
* src/progman.c (register_prog0)
(prog_open_socket,prog_start,prog_stop)
(progman_wake_sleeping)
(prog_start_prerequisites)
(react, progman_cleanup)
(progman_stop_component): Update.
(no_children_left): Fix.
* src/sysvinit.c (enablecomp): Make CF_DISABLED flag
persist for ondemand components.
(runlevel_setup_prog): Use CF_DISABLED flag.
(inittrans): Stop inactivated processes.

* doc/pies.texi: Update.

8 files changed, 156 insertions, 76 deletions

diff --git a/doc/pies.texi b/doc/pies.texi
index 46bd837..39a2694 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -2437,24 +2437,37 @@ describes the type:
 
 @multitable @columnfractions 0.2 0.7
 @headitem Flag @tab Meaning
+@item 3        @tab SysV init @samp{ctrlaltdel} component
 @item A        @tab Accept-style component
+@item B        @tab SysV init @samp{boot} component
 @item C        @tab Init-style component
+@item c        @tab SysV init @samp{once} component
+@item D        @tab SysV init @samp{ondemand} component
 @item E        @tab Command being executed
+@item F        @tab SysV init @samp{powerfail} component
+@item f        @tab SysV init @samp{powerwait} component
 @item I        @tab Inetd-style component
+@item i        @tab SysV init @samp{sysinit} component
+@item k        @tab SysV init @samp{kbrequest} component
+@item n        @tab SysV init @samp{powerfailnow} component
+@item o        @tab SysV init @samp{powerokwait} component
 @item P        @tab Pass-style component
 @item R        @tab Output redirector
+@item W        @tab SysV init @samp{wait} component
+@item w        @tab SysV init @samp{bootwait} component
 @end multitable
 
-  The second flag is meaningful only for components, i.e. if the first
-flag is one of @samp{CAIP}.  Its values are:
+  The second flag is meaningful only for components.  Its values are:
 
 @multitable @columnfractions 0.2 0.7
 @headitem Flag @tab Meaning
-@item D        @tab Disabled component
+@item -        @tab Disabled component
+@item f        @tab A finished @samp{once} component 
 @item L        @tab Inetd listener
 @item R        @tab Running component
 @item S        @tab Component is stopping
 @item s        @tab Component is sleeping
+@item T        @tab Component is stopped
 @end multitable
 
   The next column lists the PID (for running components) or socket address
diff --git a/src/comp.c b/src/comp.c
index 6a0e4ba..83818c2 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -729,6 +729,9 @@ component_finish (struct component *comp, grecs_locus_t *locus)
               comp->prereq = NULL;
             }
         }
+
+      if (comp->mode == pies_comp_ondemand)
+        comp->flags |= CF_DISABLED;
     }
 }
 
diff --git a/src/ctl.c b/src/ctl.c
index 6f50246..f4154f6 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -463,6 +463,12 @@ json_object_set_number (struct json_value *obj, char const *name, double val)
   json_object_set (obj, name, json_new_number (val));
 }
 
+void
+json_object_set_bool (struct json_value *obj, char const *name, int val)
+{
+  json_object_set (obj, name, json_new_bool (val));
+}
+
 static struct json_value *
 json_error_reply_create (const char *msg)
 {
@@ -1449,8 +1455,8 @@ static char * const pies_comp_mode_str[] = {
 };
 
 static char * const pies_status_str[] = {
-  [status_enabled]  = "enabled", 
-  [status_disabled] = "disabled",
+  [status_stopped]  = "stopped",
+  [status_running]  = "running", 
   [status_listener] = "listener",
   [status_sleeping] = "sleeping",
   [status_stopping] = "stopping",
@@ -1822,6 +1828,9 @@ prog_serialize (struct json_value *ret, struct prog *prog)
     case TYPE_COMPONENT:
       FORMAT_IDX (ret, "mode", pies_comp_mode_str, prog->v.p.comp->mode);
       FORMAT_IDX (ret, "status", pies_status_str, prog->v.p.status);
+
+      json_object_set_bool (ret, "disabled",
+                            prog->v.p.comp->flags & CF_DISABLED);
       
       if (prog->pid)
         json_object_set_number (ret, "PID", prog->pid);
@@ -1864,17 +1873,18 @@ fun_list (struct json_value *result, struct prog *prog)
 static int
 fun_stop (struct json_value *result, struct prog *prog)
 {
-  if (prog->v.p.status == status_disabled)
+  if (prog->v.p.comp->flags & CF_DISABLED
+      && prog->v.p.status == status_stopped)
     {
+      
       json_object_set_string (result, "status", "ER");
       json_object_set_string (result, "error_message", "already stopped");
       return 1;
     }
   else
     {
+      prog->v.p.comp->flags |= CF_DISABLED;
       progman_stop_component (&prog);
-      if (prog)
-        prog->v.p.comp->flags |= CF_DISABLED;
       json_object_set_string (result, "status", "OK");
     }
   return 0;
@@ -1885,15 +1895,14 @@ fun_start (struct json_value *result, struct prog *prog)
 {
   switch (prog->v.p.status)
     {
-    case status_disabled:
+    case status_stopped:
       prog->v.p.comp->flags &= ~CF_DISABLED;
-      prog->v.p.status = status_enabled;
       json_object_set_string (result, "status", "OK");
       break;
 
     case status_sleeping:
     case status_finished:
-      prog->v.p.status = status_enabled;
+      prog->v.p.status = status_stopped;
       prog->v.p.failcount = 0;
       prog->v.p.timestamp = 0;
       json_object_set_string (result, "status", "OK");
@@ -2049,7 +2058,10 @@ res_runlevel (struct ctlio *io, enum http_method meth,
           io->code = 200;
           if (strlen (val->v.s) == 1
               && sysvinit_set_runlevel (val->v.s[0]) == 0)
-            json_object_set_string (io->output.reply, "status", "OK");
+            {
+              pies_schedule_action (ACTION_RELOAD);
+              json_object_set_string (io->output.reply, "status", "OK");
+            }
           else
             {
               json_object_set_string (io->output.reply, "status", "ER");
diff --git a/src/pies.h b/src/pies.h
index 9fb87c6..14ea7b7 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -587,3 +587,4 @@ void json_object_set_string (struct json_value *obj,
                              char const *name, char const *fmt, ...);
 void json_object_set_number (struct json_value *obj,
                              char const *name, double val);
+void json_object_set_bool (struct json_value *obj, char const *name, int val);
diff --git a/src/piesctl.c b/src/piesctl.c
index d6a39a2..5f26aec 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -1075,8 +1075,8 @@ struct kwtrans mode_trans[] = {
 };
 
 struct kwtrans status_trans[] = {
-  { "enabled",  'R' },
-  { "disabled", 'D' },
+  { "running",  'R' },
+  { "stopped",  'T' },
   { "listener", 'L' },
   { "sleeping", 's' },
   { "stopping", 'S' },
@@ -1159,15 +1159,21 @@ print_comp (FILE *fp, struct json_value *v, size_t n)
   if (strcmp (type, "component") == 0)
     {
       p = getval (v, "mode", json_string, 0);
-      if (v)
+      if (p)
         fbuf[fidx++] = kwtoc (p->v.s, mode_trans);
       else
         fbuf[fidx++] = '-';
-      p = getval (v, "status", json_string, 0);
-      if (p)
-        fbuf[fidx++] = status = kwtoc (p->v.s, status_trans);
-      else
+      p = getval (v, "disabled", json_bool, 0);
+      if (p && p->v.b)
         fbuf[fidx++] = '-';
+      else
+        {
+          p = getval (v, "status", json_string, 0);
+          if (p)
+            fbuf[fidx++] = status = kwtoc (p->v.s, status_trans);
+          else
+            fbuf[fidx++] = '-';
+        }
     }