Blame 0005-Make-findTemplate-actually-return-the-saved-default.patch
|
 |
ee98474 |
From 629922b6dc32e4209980d7198b7d2aabb722033a Mon Sep 17 00:00:00 2001
|
|
|
0370b22 |
From: Peter Jones <pjones@redhat.com>
|
|
|
0370b22 |
Date: Mon, 15 Sep 2014 14:31:01 -0400
|
|
|
ee98474 |
Subject: [PATCH 05/10] Make findTemplate actually return the saved default.
|
|
|
0370b22 |
|
|
|
0370b22 |
Really not sure why this wasn't returning here before; going into the
|
|
|
0370b22 |
loop below is just going to clobber all that it's done.
|
|
|
0370b22 |
|
|
|
0370b22 |
Related: rhbz#957681
|
|
|
0370b22 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
0370b22 |
---
|
|
|
0370b22 |
grubby.c | 6 +++++-
|
|
|
0370b22 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
0370b22 |
|
|
|
0370b22 |
diff --git a/grubby.c b/grubby.c
|
|
|
0370b22 |
index 118cb84..baf646b 100644
|
|
|
0370b22 |
--- a/grubby.c
|
|
|
0370b22 |
+++ b/grubby.c
|
|
|
0370b22 |
@@ -2119,8 +2119,12 @@ struct singleEntry * findTemplate(struct grubConfig * cfg, const char * prefix,
|
|
|
0370b22 |
} else {
|
|
|
0370b22 |
entry = findEntryByTitle(cfg, defTitle, &index);
|
|
|
0370b22 |
}
|
|
|
0370b22 |
- if (entry)
|
|
|
0370b22 |
+ if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
|
|
|
0370b22 |
cfg->defaultImage = index;
|
|
|
0370b22 |
+ if (indexPtr)
|
|
|
0370b22 |
+ *indexPtr = index;
|
|
|
0370b22 |
+ return entry;
|
|
|
0370b22 |
+ }
|
|
|
0370b22 |
}
|
|
|
0370b22 |
}
|
|
|
0370b22 |
} else if (cfg->defaultImage > -1) {
|
|
|
0370b22 |
--
|
|
|
0370b22 |
1.9.3
|
|
|
0370b22 |
|