Hi Vu,
Thanks for your comments.
Best Regards,
ThienHuynh
-----Original Message-----
From: Nguyen Minh Vu <vu.m.ngu...@dektech.com.au>
Sent: Friday, November 8, 2019 9:53 AM
To: thien.m.huynh <thien.m.hu...@dektech.com.au>; thuan.t...@dektech.com.au
Cc: opensaf-devel@lists.sourceforge.net
Subject: Re: [PATCH 1/1] nid: Change the path of TIPC_MODULE [#3110]
Hi Thien,
Ack with comments.
Regards, Vu
On 11/7/19 2:25 PM, thien.m.huynh wrote:
> ---
> src/nid/configure_tipc.in | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/nid/configure_tipc.in b/src/nid/configure_tipc.in
> index 73dd1cb..218de65 100644
> --- a/src/nid/configure_tipc.in
> +++ b/src/nid/configure_tipc.in
> @@ -21,7 +21,11 @@
> . $pkgsysconfdir/nid.conf
>
> MANAGE_TIPC=${OPENSAF_MANAGE_TIPC:-"yes"}
> -TIPC_MODULE=/lib/modules/$(uname -r)/kernel/net/tipc.ko
> +TIPC_MODULE=$(modinfo tipc -n 2> /dev/null)
[Vu] Put option `-n` before tipc.
> +ret_val=$?
> +if [ $ret_val -ne 0 ] ; then
> + TIPC_MODULE=/lib/modules/$(uname -r)/kernel/net/tipc/tipc.ko
[Vu] Add double quotes around the path
> +fi
[Vu] Or you can use this below technique and remove above if
+TIPC_MODULE=$(modinfo tipc -n 2> /dev/null) ||
TIPC_MODULE="/lib/modules/$(uname -r)/kernel/net/tipc/tipc.ko"
> CHASSIS_ID_FILE=$pkgsysconfdir/chassis_id
> SLOT_ID_FILE=$pkgsysconfdir/slot_id
> SUBSLOT_ID_FILE=$pkgsysconfdir/subslot_id
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
