Minor changes to sync b1_2 with HEAD that shouldn't affect anything.

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index ac22336..2b3f0e2 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -1113,8 +1113,7 @@ class Network(Module):
                 panic("unable to set hostaddr for", self.net_type, self.hostaddr, self.cluster_id)
             debug("hostaddr:", self.hostaddr)
 
-        self.add_portals_module("libcfs", 'libcfs')
-        self.add_portals_module("portals", 'portals')
+        self.add_portals_module("libcfs", 'portals')
         if node_needs_router():
             self.add_portals_module("router", 'kptlrouter')
         if self.net_type == 'tcp':