[Ocfs-tools-commits] jlbec commits r223 - trunk/vendor/redhat

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Mon Oct 25 15:36:15 CDT 2004


Author: jlbec
Date: 2004-10-25 15:36:12 -0500 (Mon, 25 Oct 2004)
New Revision: 223

Modified:
   trunk/vendor/redhat/ocfs.init
Log:
relax strict enterprise checking

Modified: trunk/vendor/redhat/ocfs.init
===================================================================
--- trunk/vendor/redhat/ocfs.init	2004-10-15 21:55:52 UTC (rev 222)
+++ trunk/vendor/redhat/ocfs.init	2004-10-25 20:36:12 UTC (rev 223)
@@ -77,25 +77,6 @@
     ;;
 esac
 
-check_ver()
-{
-    VERNUM="$1"
-    case "$VERNUM" in
-    [0-9])
-        ;;
-    [1-9][0-9])
-        ;;
-    [1-9][0-9][0-9])
-        ;;
-    *)
-        echo -n "Checking for Red Hat enterprise kernel: "
-        failure $"Kernel ${KVER} is not a Red Hat enterprise release;"
-        echo
-        exit 1
-        ;;
-    esac
-}
-
 EVER="${KVER#${BASE_VER}}"
 ETYPE=""
 case "$EVER" in
@@ -156,7 +137,6 @@
     case "$EVER" in
     *ELorafw*)
         EVER="${EVER%${ETYPE}}"
-        check_ver "${EVER#*orafw}"
         EVER="${EVER%.ELorafw*}"
         ;;
     *)
@@ -169,36 +149,6 @@
     ;;
 esac
 
-EMAJOR=0
-EMINOR=0
-EMICRO=0
-EVER="${EVER#.}"
-EMAJOR="${EVER%%.*}"
-check_ver $EMAJOR
-ETMP="${EVER#${EMAJOR}}"
-ETMP="${ETMP#.}"
-if test -n "$ETMP"
-then
-    EMINOR="${ETMP%%.*}"
-    check_ver $EMINOR
-    ETMP="${ETMP#${EMINOR}}"
-    ETMP="${ETMP#.}"
-fi
-if test -n "$ETMP"
-then
-    EMICRO="${ETMP%%.*}"
-    check_ver $EMICRO
-    ETMP="${ETMP#${EMICRO}}"
-    ETMP="${ETMP#.}"
-fi
-if test -n "$ETMP"
-then
-    echo -n "Checking for Red Hat enterprise kernel: "
-    failure $"Kernel ${KVER} is not a Red Hat enterprise release;"
-    echo
-    exit 1
-fi
-
 # This is for path happiness...
 if test "$ETYPE" != ""
 then
@@ -207,12 +157,7 @@
 MODPATH="/lib/modules/${KVER}/kernel/drivers/addon/${MODNAME}"
 case "$BASE_STR" in
 2.4.9-e)
-    if test "${EMAJOR}" -gt 23
-    then
-        OBJPATH="/lib/modules/${BASE_STR}-${ETYPE}ABI/${MODNAME}"
-    else
-        OBJPATH="/lib/modules/${BASE_STR}-${ETYPE}ABI/${MODNAME}-noaio"
-    fi
+    OBJPATH="/lib/modules/${BASE_STR}-${ETYPE}ABI/${MODNAME}"
     ;;
 2.4.18-e)
     OBJPATH="/lib/modules/${BASE_STR}-${ETYPE}ABI/${MODNAME}"



More information about the Ocfs-tools-commits mailing list