|
 |
16aa69 |
From e19e664d4fcb1637f8ba4a4a088454acf2f94334 Mon Sep 17 00:00:00 2001
|
|
|
16aa69 |
From: Peter Jones <pjones@redhat.com>
|
|
|
16aa69 |
Date: Thu, 12 Sep 2013 20:41:33 +0200
|
|
|
16aa69 |
Subject: [PATCH 02/41] If we're using multiboot, add a new mbmodule not an
|
|
|
16aa69 |
initramfs
|
|
|
16aa69 |
|
|
|
16aa69 |
I really don't know how this ever worked.
|
|
|
16aa69 |
Related: rhbz#957681
|
|
|
16aa69 |
|
|
|
16aa69 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
16aa69 |
---
|
|
|
16aa69 |
grubby.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
|
|
|
16aa69 |
new-kernel-pkg | 3 ++-
|
|
|
16aa69 |
2 files changed, 47 insertions(+), 3 deletions(-)
|
|
|
16aa69 |
|
|
|
16aa69 |
diff --git a/grubby.c b/grubby.c
|
|
|
16aa69 |
index bbca9d0..d91a847 100644
|
|
|
16aa69 |
--- a/grubby.c
|
|
|
16aa69 |
+++ b/grubby.c
|
|
|
16aa69 |
@@ -3255,6 +3255,42 @@ int updateImage(struct grubConfig * cfg, const char * image,
|
|
|
16aa69 |
return rc;
|
|
|
16aa69 |
}
|
|
|
16aa69 |
|
|
|
16aa69 |
+int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
|
|
|
16aa69 |
+ const char * image, const char * prefix, const char * initrd) {
|
|
|
16aa69 |
+ struct singleEntry * entry;
|
|
|
16aa69 |
+ struct singleLine * line, * kernelLine, *endLine = NULL;
|
|
|
16aa69 |
+ int index = 0;
|
|
|
16aa69 |
+
|
|
|
16aa69 |
+ if (!image) return 0;
|
|
|
16aa69 |
+
|
|
|
16aa69 |
+ for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
|
|
|
16aa69 |
+ kernelLine = getLineByType(LT_MBMODULE, entry->lines);
|
|
|
16aa69 |
+ if (!kernelLine) continue;
|
|
|
16aa69 |
+
|
|
|
16aa69 |
+ if (prefix) {
|
|
|
16aa69 |
+ int prefixLen = strlen(prefix);
|
|
|
16aa69 |
+ if (!strncmp(initrd, prefix, prefixLen))
|
|
|
16aa69 |
+ initrd += prefixLen;
|
|
|
16aa69 |
+ }
|
|
|
16aa69 |
+ endLine = getLineByType(LT_ENTRY_END, entry->lines);
|
|
|
16aa69 |
+ if (endLine)
|
|
|
16aa69 |
+ removeLine(entry, endLine);
|
|
|
16aa69 |
+ line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
|
|
|
16aa69 |
+ kernelLine->indent, initrd);
|
|
|
16aa69 |
+ if (!line)
|
|
|
16aa69 |
+ return 1;
|
|
|
16aa69 |
+ if (endLine) {
|
|
|
16aa69 |
+ line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
|
|
|
16aa69 |
+ if (!line)
|
|
|
16aa69 |
+ return 1;
|
|
|
16aa69 |
+ }
|
|
|
16aa69 |
+
|
|
|
16aa69 |
+ break;
|
|
|
16aa69 |
+ }
|
|
|
16aa69 |
+
|
|
|
16aa69 |
+ return 0;
|
|
|
16aa69 |
+}
|
|
|
16aa69 |
+
|
|
|
16aa69 |
int updateInitrd(struct grubConfig * cfg, const char * image,
|
|
|
16aa69 |
const char * prefix, const char * initrd) {
|
|
|
16aa69 |
struct singleEntry * entry;
|
|
|
16aa69 |
@@ -4496,8 +4532,15 @@ int main(int argc, const char ** argv) {
|
|
|
16aa69 |
if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
|
|
|
16aa69 |
removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
|
|
|
16aa69 |
if (updateKernelPath && newKernelInitrd) {
|
|
|
16aa69 |
- if (updateInitrd(config, updateKernelPath, bootPrefix,
|
|
|
16aa69 |
- newKernelInitrd)) return 1;
|
|
|
16aa69 |
+ if (newMBKernel) {
|
|
|
16aa69 |
+ if (addMBInitrd(config, newMBKernel, updateKernelPath,
|
|
|
16aa69 |
+ bootPrefix, newKernelInitrd))
|
|
|
16aa69 |
+ return 1;
|
|
|
16aa69 |
+ } else {
|
|
|
16aa69 |
+ if (updateInitrd(config, updateKernelPath, bootPrefix,
|
|
|
16aa69 |
+ newKernelInitrd))
|
|
|
16aa69 |
+ return 1;
|
|
|
16aa69 |
+ }
|
|
|
16aa69 |
}
|
|
|
16aa69 |
if (addNewKernel(config, template, bootPrefix, newKernelPath,
|
|
|
16aa69 |
newKernelTitle, newKernelArgs, newKernelInitrd,
|
|
|
16aa69 |
diff --git a/new-kernel-pkg b/new-kernel-pkg
|
|
|
16aa69 |
index 7fec1fe..6373385 100755
|
|
|
16aa69 |
--- a/new-kernel-pkg
|
|
|
16aa69 |
+++ b/new-kernel-pkg
|
|
|
16aa69 |
@@ -404,7 +404,8 @@ update() {
|
|
|
16aa69 |
--update-kernel=$kernelImage \
|
|
|
16aa69 |
$INITRD \
|
|
|
16aa69 |
${kernargs:+--args="$kernargs"} \
|
|
|
16aa69 |
- ${removeargs:+--remove-args="$removeargs"}
|
|
|
16aa69 |
+ ${removeargs:+--remove-args="$removeargs"} \
|
|
|
16aa69 |
+ ${mbkernel:+--add-multiboot="$mbkernel"}
|
|
|
16aa69 |
else
|
|
|
16aa69 |
[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
|
|
|
16aa69 |
fi
|
|
|
16aa69 |
--
|
|
|
16aa69 |
2.4.3
|
|
|
16aa69 |
|