From 78a1b1fe1ab76964e35b4a4788238b197bfd613d Mon Sep 17 00:00:00 2001 From: Dima Zavin Date: Tue, 20 Dec 2011 12:53:48 -0800 Subject: init: delay importing files until after parsing the current file If we process the import directive inline, then the ordering of the commands for the "on xxx" sections would be a little unexpected. The init.rc files do not really have an implied order as to which section appears and gets processed first. The init code itself provides that ordering explicitly. For the user, the expectation is that if both the current file and the imported file define a section (e.g. "on init"), then the commands in the current file will be executed first, and then the ones from the imported file(s). The current implementation did not do that. It processed the import directive inline, and thus the imported (i.e. dependent) files would appear first in the command lists for the sections. This created unintended side effects and the solution would have been to try and put the import lines somewhere in the middle of the init file. This would be difficult to notice and hard to extract the dependencies. To solve this, we add the imports to a list for each file being parsed and process the list after finishing parsing the file. This provides predictable order for imports and provides a logical flow from the user perspective: the currently parsed file gets to run its commands before the files being imported. Change-Id: I06dc35ff286314060e16b18923683cd2787269de Signed-off-by: Dima Zavin --- init/parser.h | 1 + 1 file changed, 1 insertion(+) (limited to 'init/parser.h') diff --git a/init/parser.h b/init/parser.h index be937580..0a5802a4 100644 --- a/init/parser.h +++ b/init/parser.h @@ -30,6 +30,7 @@ struct parse_state void *context; void (*parse_line)(struct parse_state *state, int nargs, char **args); const char *filename; + void *priv; }; int lookup_keyword(const char *s); -- cgit v1.2.3