Hi Vu,

ACK from me (code review).

Best Regards,
ThuanTr

-----Original Message-----
From: Vu Minh Nguyen <vu.m.ngu...@dektech.com.au> 
Sent: Monday, November 25, 2019 1:45 PM
To: thuan.t...@dektech.com.au; thien.m.hu...@dektech.com.au
Cc: opensaf-devel@lists.sourceforge.net; Vu Minh Nguyen 
<vu.m.ngu...@dektech.com.au>
Subject: [PATCH 1/1] nid: fix unable to start UML cluster with tipc transport 
[#3122]

---
 src/nid/configure_tipc.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/nid/configure_tipc.in b/src/nid/configure_tipc.in
index a63c97046..43ddb06e1 100644
--- a/src/nid/configure_tipc.in
+++ b/src/nid/configure_tipc.in
@@ -221,11 +221,13 @@ function tipc_duplicate_node_detect ()
 function tipc_configure ()
 {
     echo "Inserting TIPC mdoule..."
-    
-    if ! test -f "$TIPC_MODULE"  ; then
-      modprobe tipc
+
+    # Prefer using modprobe to insmod as modprobe takes care of
+    # loading all dependencies if any. If any dependent module
+    # has not yet loaded, insmod will get failed.
+    if modprobe tipc ; then
       RM_TIPC_MODULE="modprobe -r tipc"
-    else 
+    else
       insmod "$TIPC_MODULE"
       RM_TIPC_MODULE="rmmod $TIPC_MODULE"
     fi
-- 
2.17.1




_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to