X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=linux%2Fmppe%2Fmppeinstall.sh;h=52ae7d12e31661711567ccd82a0cc1263ba7b8e2;hb=ae57a37fb6a716dddff877efde7c82a61f254c98;hp=d0a57e55bda66f5cb947323c2f41d418d2cc55ce;hpb=e6c864185f6eb34c956e82246cfd448225e2706f;p=ppp.git

diff --git a/linux/mppe/mppeinstall.sh b/linux/mppe/mppeinstall.sh
index d0a57e5..52ae7d1 100644
--- a/linux/mppe/mppeinstall.sh
+++ b/linux/mppe/mppeinstall.sh
@@ -13,11 +13,14 @@ fi
 
 # strip any trailing /
 set -- ${1%/}
-# strip leading /path/to/linux-
-ver=`echo "${1##*/}" | sed -e 's/linux-//'` # -e 's/\/$//'
-if ! expr "$ver" : 2.[24] >/dev/null ; then
-    echo "$0: Unable to determine kernel version ($ver)" >&2
-    exit 1
+# strip leading /path/to/linux- and trailing -release
+ver=`echo "${1##*/}" | sed -e 's/linux-//' -e 's/-.*//'`
+if ! expr "$ver" : 2.[246] >/dev/null ; then
+    ver=`echo "${1##*/}" | sed -e 's/kernel-source-//' -e 's/-.*//'`
+    if ! expr "$ver" : 2.[246] >/dev/null ; then
+        echo "$0: Unable to determine kernel version ($ver)" >&2
+        exit 1
+    fi
 fi
 
 # build patch files list
@@ -37,6 +40,8 @@ elif expr $ver : 2.4 >/dev/null ; then
 	echo "$0: unable to determine kernel version" >&2
 	exit 1
     fi
+elif expr $ver : 2.6 >/dev/null ; then
+    patchfiles=`echo $patchdir/linux-2.6*.patch`
 fi
 
 echo "Detected kernel version $ver"