rpms/kernel/devel kernel.spec,1.1702,1.1703

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	kernel.spec 
Log Message:
* Fri Aug 07 2009 Hans de Goede <hdegoede at redhat.com>
- When building a dracut generic initrd tell new-kernel-pkg to use that
  instead of running mkinitrd



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1702
retrieving revision 1.1703
diff -u -p -r1.1702 -r1.1703
--- kernel.spec	7 Aug 2009 10:47:28 -0000	1.1702
+++ kernel.spec	7 Aug 2009 16:12:21 -0000	1.1703
@@ -1799,7 +1799,12 @@ if [ `uname -i` == "x86_64" -o `uname -i
    [ -f /etc/sysconfig/kernel ]; then\
   /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*}} --depmod --add-dracut-args --initrdfile=/boot/initrd-generic-%{KVERREL}%{?-v:.%{-v*}}.img --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%else\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+%endif}\
 #if [ -x /sbin/weak-modules ]\
 #then\
 #    /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\
@@ -1959,6 +1964,10 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 07 2009 Hans de Goede <hdegoede at redhat.com>
+- When building a dracut generic initrd tell new-kernel-pkg to use that
+  instead of running mkinitrd
+
 * Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.139.rc5.git3
 - drm-r600-kms.patch - update r600 KMS
 - drm-radeon-fixes.patch - patches for queue to Linus