X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fscript.c;h=239ae38f5e67306408e7c386abc050b03ec5d4d6;hb=d39ae394911f945cd4a7789a8b210a5662852c46;hp=c0d6e1a4e4a31affa291713b0351f816ac16afed;hpb=9638c29114c8d575d1b89c26dcf1f274ea6ab6c4;p=petitboot

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);