From: Ray Strode <rstrode@redhat.com>
Date: Fri, 30 May 2008 13:34:08 +0000 (-0400)
Subject: Read default kernel after removing graphic boot entry from grub.conf
X-Git-Tag: 0.1.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d34239801b9dfa5dcc16db53fe27a8efd47c567;p=thirdparty%2Fplymouth.git

Read default kernel after removing graphic boot entry from grub.conf

That may fix a bug with plymouth-update-initrd that causes it to
sometimes pick the wrong kernel for the initrd it uses.
---

diff --git a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd
index e5e0414c..8793ba11 100755
--- a/scripts/plymouth-update-initrd
+++ b/scripts/plymouth-update-initrd
@@ -66,20 +66,20 @@ TMPDIR="$(mktemp -d $PWD/initrd.XXXXXXXXXX)"
 
 rm -rf "$TMPDIR"
 
-CURRENT_KERNEL=$(/sbin/grubby --default-kernel)
-
 # XXX: Hack to clean out old entry since grubby doesn't deal with dupes too well
 if fgrep -q "title $GRUB_MENU_TITLE" /etc/grub.conf; then
     TMPFILE="$(mktemp /etc/grub.conf.XXXXXXXXXX)"
     if [ -L /etc/grub.conf ]; then
         GRUB_CONF="$(readlink /etc/grub.conf)"
-    else
+   else
         GRUB_CONF="/etc/grub.conf"
     fi
     (cd /etc; awk '$1 != "'"$GRUB_MENU_TITLE"'" { printf $0 RT }' RS="title " FS="\n" $GRUB_CONF > $TMPFILE \
     && mv $TMPFILE $GRUB_CONF || rm -f $TMPFILE)
 fi
 
+CURRENT_KERNEL=$(/sbin/grubby --default-kernel)
+
 /sbin/grubby --title="$GRUB_MENU_TITLE"       \
              --add-kernel="$CURRENT_KERNEL"   \
 	     --copy-default                   \