From 573fc1790fc54b1563beb4744e98d74515248206 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jbjohnso@us.ibm.com>
Date: Tue, 2 Sep 2014 10:37:23 -0400
Subject: [PATCH] Mellanox renamed their driver in later kernels.  If new name
 detected, substitute it

---
 xCAT-server/share/xcat/netboot/rh/genimage | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 8c4ced961..e142715bf 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -543,6 +543,11 @@ if (@new_order) {
     @ndrivers = (@new_order, @ndrivers);
 }
 
+if (-f "$rootimg_dir/lib/modules/$kernelver/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko") {
+     for (@ndrivers) {
+         s/mlx_en/mlx4_en/;
+     }
+}
 open($moddeps,"<","$rootimg_dir/lib/modules/$kernelver/modules.dep");
 my @moddeps = <$moddeps>;
 my @checkdeps = @ndrivers;