From owner-svn-ports-head@freebsd.org Thu Jul 9 12:50:45 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DD9C36A0E6; Thu, 9 Jul 2020 12:50:45 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2bd12Lg4z40s1; Thu, 9 Jul 2020 12:50:45 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3412F11694; Thu, 9 Jul 2020 12:50:45 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 069CojoW042462; Thu, 9 Jul 2020 12:50:45 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 069CojRV042461; Thu, 9 Jul 2020 12:50:45 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202007091250.069CojRV042461@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 9 Jul 2020 12:50:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541747 - head/databases/galera/files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/databases/galera/files X-SVN-Commit-Revision: 541747 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2020 12:50:45 -0000 Author: joneum Date: Thu Jul 9 12:50:44 2020 New Revision: 541747 URL: https://svnweb.freebsd.org/changeset/ports/541747 Log: The garbd options are semicolon separated key value pairs. The current rc.d script does not support multiple options(eg. "gmcast.listen_addr=tcp://0.0.0.0:5567;pc.weight=1") The variable garb_galera_options need to be quoted in command line. PR: 236795 Reported by: TAO ZHOU Approved by: devel@galeracluster.com (maintainer) Sponsored by: Netzkommune GmbH Modified: head/databases/galera/files/garb.sh.in Modified: head/databases/galera/files/garb.sh.in ============================================================================== --- head/databases/galera/files/garb.sh.in Thu Jul 9 11:54:38 2020 (r541746) +++ head/databases/galera/files/garb.sh.in Thu Jul 9 12:50:44 2020 (r541747) @@ -71,7 +71,7 @@ garb_prestart() command_args="$command_args -a gcomm://$ADDRESS" [ -n "$garb_galera_group" ] && command_args="$command_args -g $garb_galera_group" - [ -n "$garb_galera_options" ] && command_args="$command_args -o $garb_galera_options" + [ -n "$garb_galera_options" ] && command_args="$command_args -o '$garb_galera_options'" [ -n "$garb_log_file" ] && command_args="$command_args -l $garb_log_file" return 0 }