From 709e85f847e601e9a4df60b67b8cd63b1bcbc15b Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 14 Sep 2016 14:39:10 -0400 Subject: [PATCH 1/2] Print before and after results of hack_uname() function --- .../share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 index 3a4881ce1..f33ab6d04 100755 --- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 +++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 @@ -137,6 +137,7 @@ echo "NODESETSTATE is $NODESETSTATE" function hack_uname() { + BEFORE_UNAME_HACK="$($1/bin/uname -r)" mv "$1/bin/uname" "$1/bin/uname.save" cat <<-EOF >"$1/bin/uname" #!/bin/sh @@ -164,6 +165,8 @@ function hack_uname() EOF chmod 0755 "$1/bin/uname" + AFTER_UNAME_HACK="$($1/bin/uname -r)" + echo "Before hack-uname() to replace 'uname' command, 'uname -r'='${BEFORE_UNAME_HACK}'. After, 'uname -r'='${AFTER_UNAME_HACK}'" } function cleanup() From 86ef6a6cca7721fb12ff154fd9f962578073d22a Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 14 Sep 2016 15:58:28 -0400 Subject: [PATCH 2/2] Added -m option and changed the formatting of the output --- .../xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 index f33ab6d04..a8ea15ea7 100755 --- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 +++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 @@ -137,7 +137,9 @@ echo "NODESETSTATE is $NODESETSTATE" function hack_uname() { - BEFORE_UNAME_HACK="$($1/bin/uname -r)" + BEFORE_UNAME_R="$($1/bin/uname -r)" + BEFORE_UNAME_M="$($1/bin/uname -m)" + echo "Before hack_uname(), -r=>'${BEFORE_UNAME_R}' -m=>'${BEFORE_UNAME_M}'" mv "$1/bin/uname" "$1/bin/uname.save" cat <<-EOF >"$1/bin/uname" #!/bin/sh @@ -165,8 +167,9 @@ function hack_uname() EOF chmod 0755 "$1/bin/uname" - AFTER_UNAME_HACK="$($1/bin/uname -r)" - echo "Before hack-uname() to replace 'uname' command, 'uname -r'='${BEFORE_UNAME_HACK}'. After, 'uname -r'='${AFTER_UNAME_HACK}'" + AFTER_UNAME_R="$($1/bin/uname -r)" + AFTER_UNAME_M="$($1/bin/uname -m)" + echo "After hack_uname(), -r='${AFTER_UNAME_R}', -m='${AFTER_UNAME_M}'" } function cleanup()