diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-09-17 14:35:38 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-09-24 13:14:59 +0800 |
| commit | d39ae394911f945cd4a7789a8b210a5662852c46 (patch) | |
| tree | 1e7877e6bf6ab54031951042b0469859f8f4853f /discover/grub2/script.c | |
| parent | 9638c29114c8d575d1b89c26dcf1f274ea6ab6c4 (diff) | |
| download | talos-petitboot-d39ae394911f945cd4a7789a8b210a5662852c46.tar.gz talos-petitboot-d39ae394911f945cd4a7789a8b210a5662852c46.zip | |
discover/grub2: Implement 'elif'
Rather than just having one conditional in an if statement, we use a
list of conditionals instead. This allows us to implement elif.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/grub2/script.c')
| -rw-r--r-- | discover/grub2/script.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/discover/grub2/script.c b/discover/grub2/script.c index c0d6e1a..239ae38 100644 --- a/discover/grub2/script.c +++ b/discover/grub2/script.c @@ -277,10 +277,12 @@ int statement_if_execute(struct grub2_script *script, bool executed; int rc; - conditional = st->conditional; - - rc = statement_conditional_execute(script, - conditional, &executed); + list_for_each_entry(&st->conditionals->list, conditional, list) { + rc = statement_conditional_execute(script, + conditional, &executed); + if (executed) + break; + } if (!executed && st->else_case) rc = statements_execute(script, st->else_case); |
