aboutsummaryrefslogtreecommitdiff
path: root/src/progman.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/progman.c')
-rw-r--r--src/progman.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/progman.c b/src/progman.c
index 88f9afa..70ebf68 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -821,13 +821,13 @@ prog_start_prologue (struct prog *prog)
{
size_t i;
for (i = 0; sockenv_var[i]; i++)
environ_unset (prog->v.p.env, sockenv_var[i], NULL);
}
envop_exec (prog->v.p.comp->envop, prog->v.p.env);
- if (init_process)
+ if (SYSVINIT_ACTIVE)
{
size_t i;
for (i = 0; sysvinit_environ_hint[i]; i++)
environ_add (prog->v.p.env, sysvinit_environ_hint[i]);
}
debug_environ (prog, 4);
@@ -896,13 +896,13 @@ prog_start (struct prog *prog)
if (prog->pid > 0 || !IS_COMPONENT (prog))
return;
if (is_sysvinit (prog->v.p.comp))
{
- if (!init_process)
+ if (!SYSVINIT_ACTIVE)
{
if (prog->active)
{
logmsg (LOG_NOTICE, "disabling sysvinit component %s",
prog_tag (prog));
prog->v.p.status = status_stopped;
@@ -992,13 +992,13 @@ prog_start (struct prog *prog)
dup2 (prog->v.p.socket, 1);
close (prog->v.p.socket);
prog->v.p.socket = -1;
break;
default:
- if (init_process)
+ if (SYSVINIT_ACTIVE)
{
int fd = console_open (O_RDWR|O_NOCTTY);
if (fd < 0)
{
logmsg (LOG_CRIT, "open(%s): %s",
console_device, strerror (errno));
@@ -1034,13 +1034,13 @@ prog_start (struct prog *prog)
dup2 (redir[RETR_OUT], 1);
}
}
break;
}
- if (!init_process)
+ if (!SYSVINIT_ACTIVE)
{
if (redir[RETR_ERR] == -1)
{
if (!DIAG_OUTPUT (DIAG_TO_STDERR))
{
close (2);
@@ -1597,13 +1597,13 @@ prog_stop (struct prog *prog, int sig)
static void
print_status (const char *tag, pid_t pid, int status, int expect_term)
{
int prio;
- if (init_process)
+ if (SYSVINIT_ACTIVE)
{
if (debug_level <= 1)
return;
prio = LOG_DEBUG;
}
else
@@ -2144,13 +2144,14 @@ progman_cleanup (int expect_term)
enable_socket (listener->v.p.socket);
}
destroy_prog (&prog);
}
else
{
- if (prog->v.p.comp->mode >= pies_mark_sysvinit
+ if (PIES_SYSVINIT_ENABLED
+ && 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),
pid, "");
prog->v.p.status = status_finished;
@@ -2300,13 +2301,13 @@ prog_to_stop (struct prog *prog)
if (IS_COMPONENT (prog) && prog->stop)
break;
return prog;
}
#define DIAG_CON \
- (init_process ? (DIAG_TO_STDERR|DIAG_REOPEN_LOG) : diag_output)
+ (SYSVINIT_ACTIVE ? (DIAG_TO_STDERR|DIAG_REOPEN_LOG) : diag_output)
/* Stop all program components marked for termination. Wait at most
2*shutdown_timeout seconds. */
void
progman_gc (void)
{

Return to:

Send suggestions and report system problems to the System administrator.