mirror of
https://gitlab.freedesktop.org/plymouth/plymouth.git
synced 2026-05-07 04:58:00 +02:00
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.
This commit is contained in:
parent
3bb498ca0a
commit
9d34239801
1 changed files with 3 additions and 3 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue