From d5c8ddfdf3f275226c02dc00ccbe63229acf6786 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Tue, 7 Dec 2010 17:33:53 -0800 Subject: [PATCH] Revert "Add "slow_start" keyword to init" This reverts commit 50b3afd9f39619f69dc6f4efc29be88933eb3614. --- init/init.c | 4 ---- init/init.h | 1 - init/init_parser.c | 4 ---- init/keywords.h | 1 - 4 files changed, 10 deletions(-) diff --git a/init/init.c b/init/init.c index ea7687d36..7aef38721 100755 --- a/init/init.c +++ b/init/init.c @@ -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); diff --git a/init/init.h b/init/init.h index 9a202b7d1..869133510 100644 --- a/init/init.h +++ b/init/init.h @@ -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 */ diff --git a/init/init_parser.c b/init/init_parser.c index 1b7522c7b..d136c28a0 100644 --- a/init/init_parser.c +++ b/init/init_parser.c @@ -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) { diff --git a/init/keywords.h b/init/keywords.h index 8710523d7..25315d835 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -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)