Attachment 593830 Details for Bug 832238 – avoid recursion in mkinitrd (grown up git patch this time)

[patch] avoid recursion in mkinitrd (grown up git patch this time)

0001-new-kernel-pkg-fix-recursion-with-mkinitrd.patch (text/plain), 1.33 KB, created by Zach Brown on 2012-06-22 21:16:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zach Brown

Created: 2012-06-22 21:16:17 UTC

Size: 1.33 KB

patch

obsolete

>From 99a377c33448cb5f0f9015425fa70feb6c276b37 Mon Sep 17 00:00:00 2001
>From: Zach Brown <zab@redhat.com>
>Date: Fri, 22 Jun 2012 14:07:11 -0700
>Subject: [PATCH] new-kernel-pkg: fix recursion with --mkinitrd
>
>commit eec2063c966df68a9e1947d9e9474df72540e3c6 ("Fix hard coded paths
>so kernel's "make install" will DTRT.") accidentally introduced
>recursion for --mkinitrd by having the mkinitrd function execute itself.
>
>I ran in to this when inadvertantly using an old ~/bin/installkernel
>script which was still using new-kernel-pkg --mkinitrd.
>
>This patch avoids the recursion by renaming the shell wrapper doMkinitrd
>(matching depmod which presumably had the same problem) so that it's not
>executed instead of the mkinitrd that's in the path.
>
>Signed-off-by: Zach Brown <zab@redhat.com>
>---
> new-kernel-pkg |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/new-kernel-pkg b/new-kernel-pkg
>index 2218ad7..44a67db 100755
>--- a/new-kernel-pkg
>+++ b/new-kernel-pkg
>@@ -512,7 +512,7 @@ update() {
>     fi
> }
> 
>-mkinitrd() {
>+doMkinitrd() {
>     if [ -n "$dracut" ]; then
>         tool="dracut $dracuthostonly -f $initrdfile $version"
>     else
>@@ -730,7 +730,7 @@ elif [ "$moddep" == "remove" ]; then
> fi
> 
> if [ "$initrd" == "make" ]; then
>-    mkinitrd
>+    doMkinitrd
> elif [ "$initrd" == "remove" ]; then
>     rminitrd
> fi
>-- 
>1.7.6.4
>

Actions: View | Diff

Attachments on bug 832238: 591952 | 593830