From: Mantas Mikulėnas <grawity@gmail.com>
Date: Tue, 30 Aug 2016 14:50:19 +0000 (+0300)
Subject: bootctl: properly skip duplicate entries (#4048)
X-Git-Tag: v232~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a908cf0a126a332a209670ad5c769efa231fd002;p=thirdparty%2Fsystemd.git

bootctl: properly skip duplicate entries (#4048)

'continue' is a fancy no-op here – it only skips through the inner loop,
not the outer one, so entries already in BootOrder get printed twice.

This partially reverts f939cff71577 "bootctl: various coding style
updates".
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index a7cdf92ed22..ee6d7eb864c 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -439,9 +439,12 @@ static int status_variables(void) {
 
                 for (j = 0; j < n_order; j++)
                         if (options[i] == order[j])
-                                continue;
+                                goto next_option;
 
                 print_efi_option(options[i], false);
+
+        next_option:
+                continue;
         }
 
         return 0;