Revert "Add "slow_start" keyword to init"
This reverts commit 50b3afd9f3
.
This commit is contained in:
parent
6388cfe03c
commit
d5c8ddfdf3
|
@ -196,10 +196,6 @@ void service_start(struct service *svc, const char *dynamic_args)
|
|||
char tmp[32];
|
||||
int fd, sz;
|
||||
|
||||
if (svc->flags & SVC_SLOW_START) {
|
||||
sleep(5);
|
||||
}
|
||||
|
||||
if (properties_inited()) {
|
||||
get_property_workspace(&fd, &sz);
|
||||
sprintf(tmp, "%d,%d", dup(fd), sz);
|
||||
|
|
|
@ -69,7 +69,6 @@ struct svcenvinfo {
|
|||
#define SVC_RESTARTING 0x08 /* waiting to restart */
|
||||
#define SVC_CONSOLE 0x10 /* requires console */
|
||||
#define SVC_CRITICAL 0x20 /* will reboot into recovery if keeps crashing */
|
||||
#define SVC_SLOW_START 0x40 /* wait a few seconds before starting */
|
||||
|
||||
#define NR_SVC_SUPP_GIDS 12 /* twelve supplementary groups */
|
||||
|
||||
|
|
|
@ -131,7 +131,6 @@ int lookup_keyword(const char *s)
|
|||
if (!strcmp(s, "etkey")) return K_setkey;
|
||||
if (!strcmp(s, "etprop")) return K_setprop;
|
||||
if (!strcmp(s, "etrlimit")) return K_setrlimit;
|
||||
if (!strcmp(s, "low_start")) return K_slow_start;
|
||||
if (!strcmp(s, "ocket")) return K_socket;
|
||||
if (!strcmp(s, "tart")) return K_start;
|
||||
if (!strcmp(s, "top")) return K_stop;
|
||||
|
@ -565,9 +564,6 @@ static void parse_line_service(struct parse_state *state, int nargs, char **args
|
|||
case K_critical:
|
||||
svc->flags |= SVC_CRITICAL;
|
||||
break;
|
||||
case K_slow_start:
|
||||
svc->flags |= SVC_SLOW_START;
|
||||
break;
|
||||
case K_setenv: { /* name value */
|
||||
struct svcenvinfo *ei;
|
||||
if (nargs < 2) {
|
||||
|
|
|
@ -62,7 +62,6 @@ enum {
|
|||
KEYWORD(setkey, COMMAND, 0, do_setkey)
|
||||
KEYWORD(setprop, COMMAND, 2, do_setprop)
|
||||
KEYWORD(setrlimit, COMMAND, 3, do_setrlimit)
|
||||
KEYWORD(slow_start, OPTION, 0, 0)
|
||||
KEYWORD(socket, OPTION, 0, 0)
|
||||
KEYWORD(start, COMMAND, 1, do_start)
|
||||
KEYWORD(stop, COMMAND, 1, do_stop)
|
||||
|
|
Loading…
Reference in New Issue