[patch 3/3] Have kernel-PAE.i686 and kernel.x86_64 fix DEFAULTKERNEL=kernel-xen

Mark McLoughlin markmc at redhat.com
Wed Jul 30 14:58:31 UTC 2008


plain text document attachment (kernel-xen-defaultkernel.patch)
Now we can fix:

  https://bugzilla.redhat.com/456558

by having kernel.x86_64 and kernel-PAE.i686 munge DEFAULTKERNEL
as appropriate.

Use sed --regexp-extended so we don't have to do "\(foo\|bar\)"

Index: devel/kernel.spec
===================================================================
--- devel.orig/kernel.spec	2008-07-30 15:50:27.000000000 +0100
+++ devel.orig/kernel.spec	2008-07-30 15:50:27.000000000 +0100
@@ -1565,7 +1565,7 @@ fi\
 %{-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 @@ fi}\
 %{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 ]

-- 




More information about the kernel mailing list