From 8c17a5d040b9ba869231b05d036f94a6d5ccc36c Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Fri, 4 Oct 2013 09:53:03 +0100 Subject: [PATCH] Fix mellanox module loading. My previous attempt at forcing the mellanox module to load was completely bogus. This should not be (although I lack hardware to be 100% sure). Change-Id: I22ff88181c9c9f0c024e021eeb7f16d79715241a Closes-Bug: #1233949 --- elements/mellanox/install.d/65-mellanox | 2 +- elements/mellanox/install.d/mellanox.modprobe | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 elements/mellanox/install.d/mellanox.modprobe diff --git a/elements/mellanox/install.d/65-mellanox b/elements/mellanox/install.d/65-mellanox index 4d545789..e35b9278 100755 --- 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 diff --git a/elements/mellanox/install.d/mellanox.modprobe b/elements/mellanox/install.d/mellanox.modprobe deleted file mode 100644 index 5b8480ca..00000000 --- a/elements/mellanox/install.d/mellanox.modprobe +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/modprobe.d/mellanox.conf -# Attempt to force the mellanox driver to be loaded -/sbin/modprobe mlx4_en