X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=linux%2Fmppe%2Fmppeinstall.sh;h=52ae7d12e31661711567ccd82a0cc1263ba7b8e2;hb=2a7288026268a2a4bcbb622e496ebe77b4f66e6e;hp=60c7324a107ef79fb3151f0ea8e8bc9fd3aa1015;hpb=fae79a1c86b3fadc9e3f1e8efbaeb5587c4e6573;p=ppp.git diff --git a/linux/mppe/mppeinstall.sh b/linux/mppe/mppeinstall.sh index 60c7324..52ae7d1 100644 --- a/linux/mppe/mppeinstall.sh +++ b/linux/mppe/mppeinstall.sh @@ -15,9 +15,12 @@ fi set -- ${1%/} # strip leading /path/to/linux- and trailing -release 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 +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"