diff options
Diffstat (limited to 'src/progman.c')
-rw-r--r-- | src/progman.c | 15 |
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 | |||
@@ -824,7 +824,7 @@ prog_start_prologue (struct prog *prog) | |||
824 | environ_unset (prog->v.p.env, sockenv_var[i], NULL); | 824 | environ_unset (prog->v.p.env, sockenv_var[i], NULL); |
825 | } | 825 | } |
826 | envop_exec (prog->v.p.comp->envop, prog->v.p.env); | 826 | envop_exec (prog->v.p.comp->envop, prog->v.p.env); |
827 | if (init_process) | 827 | if (SYSVINIT_ACTIVE) |
828 | { | 828 | { |
829 | size_t i; | 829 | size_t i; |
830 | for (i = 0; sysvinit_environ_hint[i]; i++) | 830 | for (i = 0; sysvinit_environ_hint[i]; i++) |
@@ -899,7 +899,7 @@ prog_start (struct prog *prog) | |||
899 | 899 | ||
900 | if (is_sysvinit (prog->v.p.comp)) | 900 | if (is_sysvinit (prog->v.p.comp)) |
901 | { | 901 | { |
902 | if (!init_process) | 902 | if (!SYSVINIT_ACTIVE) |
903 | { | 903 | { |
904 | if (prog->active) | 904 | if (prog->active) |
905 | { | 905 | { |
@@ -995,7 +995,7 @@ prog_start (struct prog *prog) | |||
995 | break; | 995 | break; |
996 | 996 | ||
997 | default: | 997 | default: |
998 | if (init_process) | 998 | if (SYSVINIT_ACTIVE) |
999 | { | 999 | { |
1000 | int fd = console_open (O_RDWR|O_NOCTTY); | 1000 | int fd = console_open (O_RDWR|O_NOCTTY); |
1001 | if (fd < 0) | 1001 | if (fd < 0) |
@@ -1037,7 +1037,7 @@ prog_start (struct prog *prog) | |||
1037 | break; | 1037 | break; |
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | if (!init_process) | 1040 | if (!SYSVINIT_ACTIVE) |
1041 | { | 1041 | { |
1042 | if (redir[RETR_ERR] == -1) | 1042 | if (redir[RETR_ERR] == -1) |
1043 | { | 1043 | { |
@@ -1600,7 +1600,7 @@ print_status (const char *tag, pid_t pid, int status, int expect_term) | |||
1600 | { | 1600 | { |
1601 | int prio; | 1601 | int prio; |
1602 | 1602 | ||
1603 | if (init_process) | 1603 | if (SYSVINIT_ACTIVE) |
1604 | { | 1604 | { |
1605 | if (debug_level <= 1) | 1605 | if (debug_level <= 1) |
1606 | return; | 1606 | return; |
@@ -2147,7 +2147,8 @@ progman_cleanup (int expect_term) | |||
2147 | } | 2147 | } |
2148 | else | 2148 | else |
2149 | { | 2149 | { |
2150 | if (prog->v.p.comp->mode >= pies_mark_sysvinit | 2150 | if (PIES_SYSVINIT_ENABLED |
2151 | && prog->v.p.comp->mode >= pies_mark_sysvinit | ||
2151 | && prog->v.p.comp->mode != pies_comp_ondemand) | 2152 | && prog->v.p.comp->mode != pies_comp_ondemand) |
2152 | { | 2153 | { |
2153 | sysvinit_acct (SYSV_ACCT_PROC_STOP, "", prog_tag (prog), | 2154 | sysvinit_acct (SYSV_ACCT_PROC_STOP, "", prog_tag (prog), |
@@ -2303,7 +2304,7 @@ prog_to_stop (struct prog *prog) | |||
2303 | } | 2304 | } |
2304 | 2305 | ||
2305 | #define DIAG_CON \ | 2306 | #define DIAG_CON \ |
2306 | (init_process ? (DIAG_TO_STDERR|DIAG_REOPEN_LOG) : diag_output) | 2307 | (SYSVINIT_ACTIVE ? (DIAG_TO_STDERR|DIAG_REOPEN_LOG) : diag_output) |
2307 | 2308 | ||
2308 | /* Stop all program components marked for termination. Wait at most | 2309 | /* Stop all program components marked for termination. Wait at most |
2309 | 2*shutdown_timeout seconds. */ | 2310 | 2*shutdown_timeout seconds. */ |