[ARVADOS] updated: 2.1.0-2394-g0b4945244

Git user git at public.arvados.org
Thu Apr 28 14:43:42 UTC 2022


Summary of changes:
 tools/salt-install/provision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  0b4945244d55214b331adabce38e33800b55b3e1 (commit)
      from  267c02294d7d5c1f161921f9dade6b692a7029a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0b4945244d55214b331adabce38e33800b55b3e1
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Apr 28 10:43:02 2022 -0400

    Do not pipe into `grep -q`, because that stops reading as soon as a
    match is found, which can cause a SIGPIPE.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index ad01c691b..c9e535fad 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -274,7 +274,7 @@ if [ ! -z "${HOSTNAME_EXT}" ] ; then
   # Make sure that the value configured as IP_INT is a real IP on the system.
   # If we don't error out early here when there is a mismatch, the formula will
   # fail with hard to interpret nginx errors later on.
-  ip addr list |grep -q "${IP_INT}/"
+  ip addr list |grep "${IP_INT}/" >/dev/null
   if [[ $? -ne 0 ]]; then
     echo "Unable to find the IP_INT address '${IP_INT}' on the system, please correct the value in local.params. Exiting..."
     exit 1

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list