Attachment 645286 Details for Bug 876366 – patch to install kernel instead of upgrade

[patch] patch to install kernel instead of upgrade

0001-install-kernels-not-upgrade-876366.patch (text/plain), 1.57 KB, created by Brian Lane on 2012-11-15 00:48:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Lane

Created: 2012-11-15 00:48:11 UTC

Size: 1.57 KB

patch

obsolete

>From 7b28b2c1ddd6f261935c92c378ea139e4a0d901b Mon Sep 17 00:00:00 2001
>From: "Brian C. Lane" <bcl@redhat.com>
>Date: Tue, 13 Nov 2012 17:25:35 -0800
>Subject: [PATCH] install kernels, not upgrade (#876366)
>
>In order for Grubby to setup the new kernel properly it needs a template
>to work from. If we upgrade kernel it removes all of them, leaving the
>'System Upgrade' entry which it then failfully copies, including the
>systemd.unit command which makes the new kernel thing it needs to
>upgrade.
>
>The side-effect of this is that the old kernels are left in /boot.
>---
> system-upgrade-fedora.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/system-upgrade-fedora.c b/system-upgrade-fedora.c
>index 2d79f6b..46c60cb 100644
>--- a/system-upgrade-fedora.c
>+++ b/system-upgrade-fedora.c
>@@ -220,6 +220,7 @@ int add_upgrade(rpmts ts, gchar *file) {
>     Header hdr = NULL;
>     gchar *fullfile = NULL;
>     gint rc = 1;
>+    gint upgrade = 1;
> 
>     fullfile = g_build_filename(packagedir, file, NULL);
>     if (fullfile == NULL) {
>@@ -241,9 +242,13 @@ int add_upgrade(rpmts ts, gchar *file) {
>         goto out;
>     }
> 
>+    /* kernels should be installed, not upgraded */
>+    if (g_str_has_prefix(file, "kernel-"))
>+        upgrade = 0;
>+
>     /* add it to the transaction.
>      * last two args are 'upgrade' and 'relocs' */
>-    rc = rpmtsAddInstallElement(ts, hdr, file, 1, NULL);
>+    rc = rpmtsAddInstallElement(ts, hdr, file, upgrade, NULL);
>     g_debug("added %s to transaction", file);
>     if (rc) {
>         g_warning("failed to add %s to transaction", file);
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 876366: 644454 | 645286