From: Ray Strode <rstrode@redhat.com>
Date: Tue, 10 Jun 2008 14:36:53 +0000 (-0400)
Subject: Change heuristics in update script for finding which initrd to repack
X-Git-Tag: 0.3.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d9018ac1b6d31abb794886bce9f003a4fc3be18;p=thirdparty%2Fplymouth.git

Change heuristics in update script for finding which initrd to repack

Before we were using the current initrd, now we use the default initrd
This will hopefully prevent the mismatched kernel/initrd problem.
---

diff --git a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd
index 363c44c9..6bf8ba98 100755
--- a/scripts/plymouth-update-initrd
+++ b/scripts/plymouth-update-initrd
@@ -6,7 +6,7 @@ set -e
 
 [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
 [ -z "$DATADIR" ] && DATADIR="/usr/share"
-[ -z "$INITRD" ] && INITRD="/boot/initrd-$(/bin/uname -r).img"
+[ -z "$INITRD" ] && INITRD="/boot/initrd-$(/sbin/grubby --default-kernel | sed 's/.*vmlinuz-//g').img"
 [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
 [ -z "$LIB" ] && [ $(head -n1 $SYSTEM_MAP | awk '{print $1}' | wc -c) -lt 16 ] && LIB="lib" || LIB="lib64"
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"