libefivar/libs.c:probe(): Fix the case where the first probe fails.

When adding efi_set_error() support, I accidentally changed it to treat a probe failure as a success, which winds up meaning you always try efivarfs even if the probe failed. Fixes github issue rhboot/efibootmgr#54 Fixes https://bugs.gentoo.org/show_bug.cgi?id=591864 Signed-off-by: Peter Jones <[email protected]>
rhboot · Sep 13, 2016 · e8299c8 · e8299c8
1 parent cae4809
commit e8299c8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/lib.c b/src/lib.c
@@ -256,13 +256,13 @@ libefivar_init(void)
 			}
 		} else {
 			int rc = ops_list[i]->probe();
-			if (rc <= 0)
+			if (rc <= 0) {
 				efi_error("ops_list[%d]->probe() failed", i);
-			else
+			} else {
 				efi_error_clear();
-
-			ops = ops_list[i];
-			break;
+				ops = ops_list[i];
+				break;
+			}
 		}
 	}
 }