branch: b_release_1_4_6

from Andreas:
 - grain control on which kernel use which ldiskfs series

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index f6d2c9a..84d7fc8 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -348,11 +348,15 @@ case $BACKINGFS in
                ])
                ;;
        ldiskfs)
-               LC_FSHOOKS([
-                       LDISKFS_SERIES="2.6-suse.series"
-               ],[
-                       LDISKFS_SERIES="2.6-rhel4.series"
-               ])
+               AC_MSG_CHECKING([which ldiskfs series to use])
+               case $LINUXRELEASE in
+               2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
+               2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;;
+               2.6.10*) LDISKFS_SERIES="2.6-rhel4.series" ;;
+               2.6.12*) LDISKFS_SERIES="2.6.12-vanilla.series" ;;
+               *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix lustre/autoconf/lustre-core.m4])
+               esac
+               AC_MSG_RESULT([$LDISKFS_SERIES])
                AC_SUBST(LDISKFS_SERIES)
                ;;
 esac # $BACKINGFS