rpms/kernel/devel kernel.spec,1.823,1.824

[Mark McLoughlin (markmc)]

Author: markmc

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9972

Modified Files:
	kernel.spec 
Log Message:
* Wed Jul 30 2008 Mark McLoughlin <markmc at redhat.com>
- Replace kernel-xen in DEFAULTKERNEL (#456558)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- kernel.spec	30 Jul 2008 16:26:01 -0000	1.823
+++ kernel.spec	30 Jul 2008 16:27:51 -0000	1.824
@@ -1565,7 +1565,7 @@
 %{-r:\
 if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\
    [ -f /etc/sysconfig/kernel ]; then\
-  /bin/sed -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
+  /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
 fi}\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 #if [ -x /sbin/weak-modules ]\
@@ -1588,18 +1588,22 @@
 %{nil}
 
 %kernel_variant_preun
+%ifarch x86_64
+%kernel_variant_post -r (kernel-smp|kernel-xen)
+%else
 %kernel_variant_post -r kernel-smp
+%endif
 
 %kernel_variant_preun smp
 %kernel_variant_post -v smp
 
 %kernel_variant_preun PAE
-%kernel_variant_post -v PAE -r kernel-smp
+%kernel_variant_post -v PAE -r (kernel-smp|kernel-xen)
 
 %kernel_variant_preun debug
 %kernel_variant_post -v debug
 
-%kernel_variant_post -v PAEdebug -r kernel-smp
+%kernel_variant_post -v PAEdebug -r (kernel-smp|kernel-xen)
 %kernel_variant_preun PAEdebug
 
 if [ -x /sbin/ldconfig ]
@@ -1706,6 +1710,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jul 30 2008 Mark McLoughlin <markmc at redhat.com>
+- Replace kernel-xen in DEFAULTKERNEL (#456558)
+
 * Tue Jul 29 2008 Dave Jones <davej at redhat.com>
 - Disable CONFIG_VIDEO_ADV_DEBUG (#456751)