b=13679

i=cliffw
i=yangsheg

Bring our post[un]install scripts more into line with SLES10's so that
we are installing the bootloader on SLES10 also.

diff --git a/build/lustre-kernel-2.4.spec.in b/build/lustre-kernel-2.4.spec.in
index 2ea2306..b296702 100644 (file)
--- a/build/lustre-kernel-2.4.spec.in
+++ b/build/lustre-kernel-2.4.spec.in
@@ -406,7 +406,7 @@ for flavor in "" smp bigmem bigsmp pseries64 BOOT jensen ; do
                                # than installed, so force modules.dep to be recreated
                                echo "rm -f /lib/modules/%{KVERREL}${delim_flavor}/modules.dep" >> ${script}
                                echo "if [ -f /etc/modprobe.conf ] ; then" >> ${script}                 
-                               sed -e "s^%ver_str^%{KVERREL}${delim_flavor}^g" %{SOURCE26} >> ${script}
+                               sed -e "s^%ver_str^%{KVERREL}${delim_flavor}^g" -e "s^%flavor^${flavor}^" %{SOURCE26} >> ${script}
 
                                echo "else" >> ${script}
                                sed -e "s^%ver_str^%{KVERREL}${delim_flavor}^g" -e "s^%%{cfg_name}^${delim_flavor}^g" %{SOURCE29} >> ${script}