From 743627baa5bada63311f4254a41483f730652a54 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 4 Oct 2013 10:12:09 +0000 Subject: [PATCH] - move initrd creation/boot loader update to posttrans --- kernel-vanilla.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 2cd7e24..b214542 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -511,9 +511,10 @@ fi %post %depmod %{kernel_release} +%posttrans [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel +# generate simple initramfs/initrd image if [[ "$USE_GENINITRD" != [Nn][Oo] ]]; then - # generate initrd after all dependant modules are installed /sbin/geninitrd -f %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release} fi @@ -523,11 +524,11 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then fi # update boot loader -[ -x /sbin/update-grub -a -f /etc/sysconfig/grub ] && . /etc/sysconfig/grub -if [[ "$UPDATE_GRUB" != [Nn][Oo] ]]; then - /sbin/update-grub +if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then + if [ "$(. /etc/sysconfig/grub; echo ${UPDATE_GRUB:-no})" = "yes" ]; then + /sbin/update-grub >/dev/null + fi fi - if [ -x /sbin/new-kernel-pkg ]; then /sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.img --install %{kernel_release} --banner "TLD Linux %{alt_kernel}" fi -- 2.46.0