fix handling 3.x.y kernels

svn-id: @12364

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 25abb6edaeff853e1d2b50843a0eec3d15043eec..04d116d349dff067c3923aaaf979bc07981b3a1b 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -83,13 +83,18 @@ clean_vserver_mtab() {
 
 # Loads modules from /etc/modules, /etc/modules.X.Y and /etc/modules.X.Y.Z
 load_kernel_modules() {
+       local _x _y _z v v1 old_IFS kernel kerneleq
        {
-               local _x _y v _z
-               read  _x _y v _z
+               read _x _y v _z
                old_IFS=$IFS
-               IFS='.'
+               # strip _* or -* from versions like: "2.6.25_vanilla-1", "2.6.25-1"
+               IFS='_-'
                set -- $v
+               v1=${1}
+               IFS='.'
+               set -- $v1
                IFS=$old_IFS
+
                kernel="$1.$2"
                kerneleq="$1.$2.$3"
        } < /proc/version