|
 |
cca0c4 |
From 12ae8096bd3099b81fded8c30be1a8050ed7e68c Mon Sep 17 00:00:00 2001
|
|
|
cca0c4 |
From: Robert Marshall <rmarshall@redhat.com>
|
|
|
cca0c4 |
Date: Thu, 8 Dec 2016 16:52:45 -0500
|
|
|
cca0c4 |
Subject: [PATCH 32/55] Track configuration modifications
|
|
|
cca0c4 |
|
|
|
cca0c4 |
The setDefaultImage function had a subtle dependency on being run before
|
|
|
cca0c4 |
addNewKernel is invoked. Added the ability to track invocation to
|
|
|
cca0c4 |
prevent them from being so tightly coupled.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
Related: rhbz#1285601
|
|
|
cca0c4 |
---
|
|
|
cca0c4 |
grubby.c | 7 ++++++-
|
|
|
cca0c4 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
cca0c4 |
|
|
|
cca0c4 |
diff --git a/grubby.c b/grubby.c
|
|
|
cca0c4 |
index a717c18999b..1f712ec1391 100644
|
|
|
cca0c4 |
--- a/grubby.c
|
|
|
cca0c4 |
+++ b/grubby.c
|
|
|
cca0c4 |
@@ -678,6 +678,8 @@ struct grubConfig {
|
|
|
cca0c4 |
int fallbackImage; /* just like defaultImage */
|
|
|
cca0c4 |
int flags;
|
|
|
cca0c4 |
struct configFileInfo *cfi;
|
|
|
cca0c4 |
+ int isModified; /* assumes only one entry added
|
|
|
cca0c4 |
+ per invocation of grubby */
|
|
|
cca0c4 |
};
|
|
|
cca0c4 |
|
|
|
cca0c4 |
blkid_cache blkid;
|
|
|
cca0c4 |
@@ -1297,6 +1299,7 @@ static struct grubConfig *readConfig(const char *inName,
|
|
|
cca0c4 |
cfg->theLines = NULL;
|
|
|
cca0c4 |
cfg->entries = NULL;
|
|
|
cca0c4 |
cfg->fallbackImage = 0;
|
|
|
cca0c4 |
+ cfg->isModified = 0;
|
|
|
cca0c4 |
|
|
|
cca0c4 |
/* copy everything we have */
|
|
|
cca0c4 |
while (*head) {
|
|
|
cca0c4 |
@@ -4726,8 +4729,10 @@ int addNewKernel(struct grubConfig *config, struct singleEntry *template,
|
|
|
cca0c4 |
}
|
|
|
cca0c4 |
|
|
|
cca0c4 |
if (updateImage(config, indexs, prefix, newKernelArgs, NULL,
|
|
|
cca0c4 |
- newMBKernelArgs, NULL))
|
|
|
cca0c4 |
+ newMBKernelArgs, NULL)) {
|
|
|
cca0c4 |
+ config->isModified = 1;
|
|
|
cca0c4 |
return 1;
|
|
|
cca0c4 |
+ }
|
|
|
cca0c4 |
|
|
|
cca0c4 |
return 0;
|
|
|
cca0c4 |
}
|
|
|
cca0c4 |
--
|
|
|
cca0c4 |
2.17.1
|
|
|
cca0c4 |
|