From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>

Date: Tue, 8 Feb 2022 08:39:10 +0100

Subject: [PATCH] search: fixed bug stopping iteration when --no-floppy is used

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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>

(cherry picked from commit e784b4b3367341b0468dd2a83b265d49383f48ae)

(cherry picked from commit 8f4688fd61dcf35de3d7ebbc2b237cfa2f202930)

---

 grub-core/commands/search.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c

index ddda6e7c5..d3180bf66 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