From: Renaud Métrich <rmetrich@redhat.com>
Date: Tue, 8 Feb 2022 07:39:10 +0000 (+0100)
Subject: commands/search: Fix bug stopping iteration when --no-floppy is used
X-Git-Tag: grub-2.12-rc1~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68ba54c2298604146be83cae144dafd1cfd1fe2d;p=thirdparty%2Fgrub.git

commands/search: Fix bug stopping iteration when --no-floppy is used

When using --no-floppy and a floppy was encountered, iterate_device()
was returning 1, causing the iteration to stop instead of continuing.

Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
index ed090b3af..51656e361 100644
--- a/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@ -64,7 +64,7 @@ iterate_device (const char *name, void *data)
   /* Skip floppy drives when requested.  */
   if (ctx->no_floppy &&
       name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
-    return 1;
+    return 0;
 
 #ifdef DO_SEARCH_FS_UUID
 #define compare_fn grub_strcasecmp