From a908cf0a126a332a209670ad5c769efa231fd002 Mon Sep 17 00:00:00 2001
From: Mantas Mikulėnas <grawity@gmail.com>
Date: Tue, 30 Aug 2016 17:50:19 +0300
Subject: bootctl: properly skip duplicate entries (#4048)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

'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".
---
 src/boot/bootctl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index a7cdf92ed2..ee6d7eb864 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;
-- 
cgit v1.2.3-54-g00ecf