From 7d9d60eb69157cf486fdf94be02d50fbc227e804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 10 Jul 2015 18:02:37 +0200 Subject: [PATCH] rpm: change post script to not use grubby --- kernel.spec | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/kernel.spec b/kernel.spec index 3e10d5d..ceffb6a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -60,9 +60,6 @@ Provides: kernel-drm-nouveau = 16 Provides: kernel-modules-extra = %kernelrelease Provides: kernel-modeset = 1 -Requires(post): /sbin/new-kernel-pkg -Requires(preun):/sbin/new-kernel-pkg - Requires(pre): coreutils gawk Requires(post): dracut binutils @@ -345,31 +342,13 @@ do done %post - -INITRD_OPT="--mkinitrd --dracut" - -/sbin/new-kernel-pkg --package %{name}-%{kernelrelease}\ - $INITRD_OPT \ - --depmod --kernel-args="max_loop=255"\ - --multiboot=/boot/xen.gz --mbargs="console=none" \ - --banner="Qubes"\ - --make-default --install %{kernelrelease} - -if [ -e /boot/grub/grub.conf ]; then -# Make it possible to enter GRUB menu if something goes wrong... -sed -i "s/^timeout *=.*/timeout=3/" /boot/grub/grub.conf -fi +/sbin/depmod -a %{kernelrelease} %posttrans -/sbin/new-kernel-pkg --package %{name}-%{kernelrelease} --rpmposttrans %{kernelrelease} - -# grubby (used by new-kernel-pkg) do not understand xen entries in grub2 config -if [ -e /boot/grub2/grub.cfg ]; then - grub2-mkconfig > /boot/grub2/grub.cfg -fi +/bin/kernel-install add %{kernelrelease} /boot/vmlinuz-%{kernelrelease} || exit $? %preun -/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{kernelrelease} +/bin/kernel-install remove %{kernelrelease} /boot/vmlinuz-%{kernelrelease} || exit $? %files %defattr(-, root, root)