diff --git a/scripts/onload_install b/scripts/onload_install index 3af0917..d33f565 100755 --- a/scripts/onload_install +++ b/scripts/onload_install @@ -259,7 +259,7 @@ install_userland() { install_x onload_tool "$i_sbin/onload_tool" install_x onload "$i_usrbin/onload" install_x sfcirqaffinity "$i_usrsbin/sfcirqaffinity" - install_x onload_misc/onload_init_rc "$i_etc/init.d/openonload" +# install_x onload_misc/onload_init_rc "$i_etc/init.d/openonload" install_f onload_misc/onload_sysconfig "$i_etc/sysconfig/openonload" install_x onload_tcpdump "$i_usrbin/onload_tcpdump" install_x onload_iptables "$i_usrbin/onload_iptables" @@ -325,7 +325,7 @@ install_ldconfig() { install_kernel_modules() { # Install kernel drivers. - did="$i_prefix/lib/modules/$KVER/extra" + did="$i_prefix$(readlink -f /lib/modules/$KVER/extramodules)" try $do cd "$TOP/build" d=$(mmaketool --driverbuild) if ! $test; then @@ -487,7 +487,7 @@ check_whether_installed() { fi local drv where for drv in sfc.ko onload.ko sfc_aoe.ko; do - for where in updates extra; do + for where in extramodules; do check_file_installed "$i_prefix/lib/modules/$KVER/$where/$drv" done done @@ -508,7 +508,7 @@ do_rpm_install() { do_rpm_post() { # Invoked by the rpm install. - install_init_script + #install_init_script is_rhel4 && rhel4_modprobe_fixup exit } diff --git a/scripts/onload_misc/onload_depmod.conf b/scripts/onload_misc/onload_depmod.conf index c2cdeeb..65dae7a 100644 --- a/scripts/onload_misc/onload_depmod.conf +++ b/scripts/onload_misc/onload_depmod.conf @@ -1,4 +1,4 @@ # Ensure that drivers provided by Onload install override any that came # with the kernel. override sfc * weak-updates -override sfc * extra +override sfc * extramodules