rpms/kernel/devel kernel.spec,1.1914,1.1915

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv367

Modified Files:
	kernel.spec 
Log Message:
Move initrd creation to %%posttrans

We don't need to worry about what dmraid/multipath/etc packages are installed
(or, rather, when they get installed) if we don't build the initrd until the
end of the transaction.

Resolves: rhbz#557922



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1914
retrieving revision 1.1915
diff -u -p -r1.1914 -r1.1915
--- kernel.spec	5 Feb 2010 20:53:30 -0000	1.1914
+++ kernel.spec	5 Feb 2010 23:08:30 -0000	1.1915
@@ -445,7 +445,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, linux-firmware, grubby >= 7.0.4-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, linux-firmware, grubby >= 7.0.10-1
 %if %{with_dracut}
 %define initrd_prereq  dracut >= 001-7
 %else
@@ -1792,6 +1792,12 @@ fi\
 #
 %define kernel_variant_posttrans() \
 %{expand:%%posttrans %{?1}}\
+%{expand:\
+%if %{with_dracut}\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --update %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%else\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --update %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%endif}\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\
 %{nil}
 
@@ -1810,11 +1816,8 @@ if [ `uname -i` == "x86_64" -o `uname -i
   /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
 fi}\
 %{expand:\
-%if %{with_dracut}\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
-%else\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
-%endif}\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+}\
 #if [ -x /sbin/weak-modules ]\
 #then\
 #    /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\
@@ -1974,6 +1977,10 @@ fi
 # and build.
 
 %changelog
+* Fri Feb 05 2010 Peter Jones <pjones at redhat.com>
+- Move initrd creation to %%posttrans
+  Resolves: rhbz#557922
+
 * Fri Feb 05 2010 Kyle McMartin <kyle at redhat.com>
 - If %with_firmware, continue with kernel-firmware, otherwise prereq on the
   separate linux-firmware pkg. Thanks to dzickus for noticing.