aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2013-01-04 15:11:34 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2013-01-04 15:11:34 +0200
commit95bc9b24928eb9951f0644307e417df0bc8c53b4 (patch)
treef1432aece52bdd1b334a13baec73f400d5a8afa3
parentc4603bf6e05687805744f67be0934b94c21e98a4 (diff)
downloadpies-95bc9b24928eb9951f0644307e417df0bc8c53b4.tar.gz
pies-95bc9b24928eb9951f0644307e417df0bc8c53b4.tar.bz2
Minor fixes.
* src/pies.c (modetab): Discern between "wait" and "respawn". * src/progman.c (progman_cleanup): Mark a terminated sysvinit component as status_finished.
-rw-r--r--src/pies.c25
-rw-r--r--src/progman.c2
-rw-r--r--src/sysvinit.c2
3 files changed, 15 insertions, 14 deletions
diff --git a/src/pies.c b/src/pies.c
index e013d88..713ae8e 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -825,18 +825,19 @@ _cb_socket_type (enum grecs_callback_command cmd,
static struct tokendef modetab[] = {
{"exec", pies_comp_exec},
- {"wait", pies_comp_exec},
- {"once", pies_comp_once},
- {"accept", pies_comp_accept},
- {"inetd", pies_comp_inetd},
- {"nostartaccept", pies_comp_inetd},
- {"pass-fd", pies_comp_pass_fd},
- {"pass", pies_comp_pass_fd},
- {"boot", pies_comp_boot},
- {"bootwait", pies_comp_boot},
- {"powerfail", pies_comp_powerfail},
- {"powerwait", pies_comp_powerwait},
- {"powerokwait", pies_comp_powerokwait},
+ {"respawn", pies_comp_exec},
+ {"wait", pies_comp_wait},
+ {"once", pies_comp_once},
+ {"accept", pies_comp_accept},
+ {"inetd", pies_comp_inetd},
+ {"nostartaccept", pies_comp_inetd},
+ {"pass-fd", pies_comp_pass_fd},
+ {"pass", pies_comp_pass_fd},
+ {"boot", pies_comp_boot},
+ {"bootwait", pies_comp_boot},
+ {"powerfail", pies_comp_powerfail},
+ {"powerwait", pies_comp_powerwait},
+ {"powerokwait", pies_comp_powerokwait},
{"ctrlaltdel", pies_comp_ctrlaltdel},
{"ondemand", pies_comp_ondemand},
{"sysinit", pies_comp_sysinit},
diff --git a/src/progman.c b/src/progman.c
index e25219a..f0d0de6 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -2459,7 +2459,7 @@ progman_cleanup (int expect_term)
if (listener->v.p.comp->flags & CF_WAIT)
enable_socket (listener->v.p.socket);
}
- else if (prog->v.p.comp->mode == pies_comp_once)
+ else if (is_sysvinit(prog->v.p.comp->mode))
{
prog->v.p.status = status_finished;
}
diff --git a/src/sysvinit.c b/src/sysvinit.c
index cfef974..e09802f 100644
--- a/src/sysvinit.c
+++ b/src/sysvinit.c
@@ -169,4 +169,4 @@ is_comp_wait (struct component *comp)
}
return 1;
}
-
+

Return to:

Send suggestions and report system problems to the System administrator.