diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2014-01-14 10:56:41 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-01-14 11:02:32 +0800 |
| commit | 5ee01bf795817cbfa9fb378b11ebd212d66e51c1 (patch) | |
| tree | 2c4b2279eaef9b82606f3017e962a7d89aa56bcd /discover | |
| parent | fb03a29fab5130041ed8f607f811dadeb797e5c9 (diff) | |
| download | talos-petitboot-5ee01bf795817cbfa9fb378b11ebd212d66e51c1.tar.gz talos-petitboot-5ee01bf795817cbfa9fb378b11ebd212d66e51c1.zip | |
discover/yaboot: Clear globals_done when we see an image definition
Currently, we have a bug where a 'known_name' that appears before an
image section will cause globals_done to be set, and we don't see any
further global variables.
This change sets globals_done only once we see an image section.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
| -rw-r--r-- | discover/yaboot-parser.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c index 41f43eb..eaefbf0 100644 --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -197,11 +197,10 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name, if (!conf_param_in_list(state->known_names, name)) return; - state->globals_done = 1; - /* image */ - if (streq(name, "image")) { + /* an image section finishes our global defintions */ + state->globals_done = 1; /* First finish any previous image. */ if (opt) |
