--- trunk/virtualbox/vboxsf.sh 2010/08/22 18:40:26 1116 +++ trunk/virtualbox/vboxsf.sh 2012/02/07 22:57:29 1639 @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /root/magellan-cvs/src/virtualbox/vboxsf.sh,v 1.2 2010-08-22 18:40:26 niro Exp $ +# $Id$ # Compiles vboxsf module for given kernel die() { echo -e "${COLRED}$@${COLDEFAULT}"; exit 1; } @@ -33,11 +33,11 @@ local ksrc="$@" local mod_suffix - if [[ $(kernel_major_version ${ksrc}) = 2.6 ]] + if [[ $(kernel_major_version ${ksrc}) = 2.4 ]] then - mod_suffix="ko" - else mod_suffix="o" + else + mod_suffix="ko" fi echo "${mod_suffix}" @@ -48,6 +48,7 @@ SRCTARBALL="/usr/src/vboxsf/vboxsf-${PVER}.tar.bz2" SRCDIR="${BUILDROOT}/vboxsf" KERNEL_MODULE="vboxsf" +MODULES_AUTOLOAD="/etc/modules-load.d" COLRED="\033[1;6m\033[31m" COLGREEN="\033[1;6m\033[32m" @@ -89,6 +90,11 @@ fi rm -f ${KERNEL_MODULE_DEST}/${KERNEL_MODULE}.${KERNEL_MODULE_SUFFIX} fi +if [[ -f ${MODULES_AUTOLOAD}/${KERNEL_MODULE}.conf ]] +then + mecho "Removing old ${KERNEL_MODULE} autoload config ..." + rm -f ${MODULES_AUTOLOAD}/${KERNEL_MODULE}.conf +fi # unpack src-tarball mecho "Uncompressing src-tarball ..." @@ -101,6 +107,10 @@ mecho "Installing ${KERNEL_MODULE}-module into ${KERNEL_MODULE_DEST} ..." install -d ${KERNEL_MODULE_DEST} || die install -m0644 ${KERNEL_MODULE}.${KERNEL_MODULE_SUFFIX} ${KERNEL_MODULE_DEST} || die +if [[ -d ${MODULE_AUTOLOAD} ]] +then + echo "${KERNEL_MODULE}" > ${MODULES_AUTOLOAD}/${KERNEL_MODULE}.conf +fi mecho "Calculating module dependencies ..." depmod -a ${KERNEL_VERSION}