From: Marcin Krol Date: Fri, 4 Oct 2013 10:08:55 +0000 (+0000) Subject: - cosmetics in posttrans X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f7bda2499defe1041d6295b34a0d88f2f7a89eb3;p=packages%2Fkernel.git - cosmetics in posttrans --- diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index e5fdbfb..99138db 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -526,8 +526,8 @@ fi %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 --initrdfs=initramfs %{initrd_dir}/initrd-%{kernel_release}.img %{kernel_release} fi @@ -537,9 +537,10 @@ if [[ "$USE_DRACUT" != [Nn][Oo] ]] && [ -x /sbin/dracut ]; then fi # update boot loaders -[ -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: %{alt_kernel}}"