bootctl: properly skip duplicate entries (#4048)
authorMantas Mikulėnas <grawity@gmail.com>
Tue, 30 Aug 2016 14:50:19 +0000 (17:50 +0300)
committerLennart Poettering <lennart@poettering.net>
Tue, 30 Aug 2016 14:50:19 +0000 (16:50 +0200)
'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

index a7cdf92..ee6d7eb 100644 (file)
@@ -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;