From: Vladimir Sokolovsky <vlad@mellanox.co.il>
Date: Sun, 2 May 2010 12:14:02 +0000 (+0300)
Subject: Stop using deprecated /etc/modprobe.conf
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5294779b2a40aaba29602a33761feb16566ec517;p=~aditr%2Fofed_scripts.git

Stop using deprecated /etc/modprobe.conf

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.co.il>
---

diff --git a/install.pl b/install.pl
index bf9b854..70567c5 100755
--- a/install.pl
+++ b/install.pl
@@ -4400,8 +4400,8 @@ sub main
         # Decrease send/receive queue sizes on 32-bit arcitecture
         # BUG: https://bugs.openfabrics.org/show_bug.cgi?id=1420
         if ($arch =~ /i[3-6]86/) {
-            if (-f "/etc/modprobe.conf") {
-                open(MODPROBE_CONF, ">>/etc/modprobe.conf");
+            if (-f "/etc/modprobe.d/ib_ipoib.conf") {
+                open(MODPROBE_CONF, ">>/etc/modprobe.d/ib_ipoib.conf");
                 print MODPROBE_CONF "options ib_ipoib send_queue_size=64 recv_queue_size=128\n";
                 close MODPROBE_CONF;
             }
diff --git a/uninstall.sh b/uninstall.sh
index 7205dd3..44488ed 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -311,8 +311,6 @@ uninstall()
         /bin/rm -rf ${LIB_MOD_DIR}/kernel/net/rds
     fi
 
-    perl -ni -e "print unless (/mlx4_core/)" /etc/modprobe.conf
-
     if [ -f /etc/modprobe.d/ipv6 ]; then
         perl -ni -e "s@# install ipv6 \/bin\/true@install ipv6 /bin/true@;print" /etc/modprobe.d/ipv6
     fi