Merge "Fix mellanox module loading."

2013-10-07 03:49:46 +00:00
parent 3c4e008ef2 8c17a5d040
commit 21a81d8b79
2 changed files with 1 additions and 4 deletions
--- a/elements/mellanox/install.d/65-mellanox
+++ b/elements/mellanox/install.d/65-mellanox
@@ -6,4 +6,4 @@ set -e
 home=$(dirname $0)

 install -m 0644 -o root -g root $home/mellanox-rules.udev /etc/udev/rules.d/81-mellanox.rules
-install -m 0644 -o root -g root $home/mellanox.modprobe /etc/modprobe.d/mellanox.conf
+echo "mlx4_en" >>/etc/modules
--- a/elements/mellanox/install.d/mellanox.modprobe
+++ b/elements/mellanox/install.d/mellanox.modprobe
@@ -1,3 +0,0 @@
-# /etc/modprobe.d/mellanox.conf
-# Attempt to force the mellanox driver to be loaded
-/sbin/modprobe mlx4_en