From patchwork Wed Jul 3 05:30:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1956002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WDSzT5XzYz1xpP for ; Wed, 3 Jul 2024 15:30:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 13D8A60D54; Wed, 3 Jul 2024 05:30:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 5G-Oi5OlRJQm; Wed, 3 Jul 2024 05:30:27 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0FDED6080A Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0FDED6080A; Wed, 3 Jul 2024 05:30:27 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F323BC002B; Wed, 3 Jul 2024 05:30:26 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id AF65DC002A for ; Wed, 3 Jul 2024 05:30:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9106D83F1D for ; Wed, 3 Jul 2024 05:30:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ZSAYJ_P01oEe for ; Wed, 3 Jul 2024 05:30:25 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.167.46; helo=mail-lf1-f46.google.com; envelope-from=frode.nordahl@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 7264D83F18 Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=ubuntu.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7264D83F18 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7264D83F18 for ; Wed, 3 Jul 2024 05:30:24 +0000 (UTC) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52cdb0d8107so5885243e87.1 for ; Tue, 02 Jul 2024 22:30:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719984622; x=1720589422; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IaFRjRriEPIt+MRhvZkGQWT0VOmlhNpQNsTfQKwB678=; b=TyDgExBRGDeizqNRMhsd2kFuyt7bFdnul09dy5YlY0zLLco9AcZwRaLw6rjFoGiLl1 ktfvkLq/jAlXkdKRhCtOYQnLCNX29M52J330+smofokLb6yNfsAUWaQOrPEOxBfsTVAf Wtpwq7iYtVEhWjYm8i58uddHPlRU9eHUzdXOkP8615bJnvM/q+av5pUBtWqdgj+JdVBb ZkuB5zWwF/AVlCpvMsWUSt4YUTO9IEMzkVpbAnvphnqJVwytmYCxgXQRriQGX3JMzL2j QiRuDdC97BeALVvSTnnFrABr3xYWdnZX+xjReMEfQxaITf0tTGKtQFedH3NS3DCBiAyU oNng== X-Gm-Message-State: AOJu0YwEizRkxxpzvyr0yOGWjmeQsJ8IzTR5fXb+sEpSSKIyliI5J5pR mKr/lwnD2Z6kyxqAtUIv/Jb30iiKNGBU6mkL/TEkrUbRhO35OyFbcYIbUA== X-Google-Smtp-Source: AGHT+IG8Tat3I/vElnvsC6xtmoQcqYClbd8v5nZhb+nnDc5ieccFn0AVEZy4i/kBCSeq8xEC4MJnTA== X-Received: by 2002:a05:6512:3091:b0:52c:d8c1:8d15 with SMTP id 2adb3069b0e04-52e826f7286mr8115826e87.46.1719984621722; Tue, 02 Jul 2024 22:30:21 -0700 (PDT) Received: from localhost.localdomain ([2001:4643:d087:0:79b7:a938:e44c:ec6b]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab1146bsm2052331e87.108.2024.07.02.22.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 22:30:21 -0700 (PDT) From: Frode Nordahl To: dev@openvswitch.org Date: Wed, 3 Jul 2024 07:30:20 +0200 Message-ID: <20240703053020.177517-1-fnordahl@ubuntu.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn] ovn-ctl: Fix incorrect use of `==` operator. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladislav Odintsov Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The ovn-ctl script uses a POSIX shell in its shebang line, however commit 12412b13c9e2 added two occurrences of the `==` operator which is bash specific. Symptoms of the issue are failure to start up and the follwing messages logged: ovn-ctl: 287: test: X: unexpected operator ovn-ctl: 307: test: X: unexpected operator Fixes: 12412b13c9e2 ("ovn-ctl: Support for --config-file ovsdb-server option.") Reported-at: https://launchpad.net/bugs/2071767 Signed-off-by: Frode Nordahl --- utilities/ovn-ctl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/ovn-ctl b/utilities/ovn-ctl index a4f410e4f..d7ca9e758 100755 --- a/utilities/ovn-ctl +++ b/utilities/ovn-ctl @@ -284,7 +284,7 @@ $cluster_remote_port set ovsdb-server set "$@" $log --log-file=$logfile set "$@" --pidfile=$db_pid_file - if test X"$config_file" == X; then + if test X"$config_file" = X; then set "$@" --remote=punix:$sock else set "$@" --config-file=$config_file @@ -304,7 +304,7 @@ $cluster_remote_port set exec "$@" fi - if test X"$use_remote_in_db" != Xno && test X"$config_file" == X; then + if test X"$use_remote_in_db" != Xno && test X"$config_file" = X; then set "$@" --remote=db:$schema_name,$table_name,connections fi