diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-10-31 22:06:10 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-10-31 22:06:10 +0000 |
| commit | 01ec0a68c9b47f19748c1e3fe26891c74f38c362 (patch) | |
| tree | 844ee09400694d7bcafe8c6ca995bffa9f92812f /sys-cluster | |
| parent | Do not delete headers installed by gnulib #527200 by Jorge Nerin. (diff) | |
| download | gentoo-2-01ec0a68c9b47f19748c1e3fe26891c74f38c362.tar.gz gentoo-2-01ec0a68c9b47f19748c1e3fe26891c74f38c362.tar.bz2 gentoo-2-01ec0a68c9b47f19748c1e3fe26891c74f38c362.zip | |
Refine enewuser command and remove bashisms; Thanks to dcmwai in IRC for feedback
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/galera/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/galera/files/garb.sh | 4 | ||||
| -rw-r--r-- | sys-cluster/galera/galera-25.3.5.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog index c0d40de8456d..09b0efc72dfc 100644 --- a/sys-cluster/galera/ChangeLog +++ b/sys-cluster/galera/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/galera # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v 1.2 2014/10/31 20:33:34 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v 1.3 2014/10/31 22:06:10 grknight Exp $ + + 31 Oct 2014; Brian Evans <grknight@gentoo.org> files/garb.sh, + galera-25.3.5.ebuild: + Refine enewuser command and remove bashisms; Thanks to dcmwai in IRC for + feedback 31 Oct 2014; Brian Evans <grknight@gentoo.org> galera-25.3.5.ebuild: Add missing user inherit diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh index e5538bcb4269..63e88dff5cdf 100644 --- a/sys-cluster/galera/files/garb.sh +++ b/sys-cluster/galera/files/garb.sh @@ -25,13 +25,13 @@ start() { for ADDRESS in ${GALERA_NODES} 0; do HOST=$(echo $ADDRESS | cut -d \: -f 1 ) PORT=$(echo $ADDRESS | cut -d \: -f 2 ) - if [[ "${HOST}" == "${PORT}" ]]; then + if [ "x${HOST}" = "x${PORT}" ]; then PORT=${GALERA_PORT} fi PORT=${PORT:-$GALERA_PORT} nc -z ${HOST} ${PORT} > /dev/null && break done - if [ ${ADDRESS} == "0" ]; then + if [ ${ADDRESS} = "0" ]; then eerror "None of the nodes in GALERA_NODES is accessible" return 1 fi diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild index ae805c8d8a3e..d5d7810c1c43 100644 --- a/sys-cluster/galera/galera-25.3.5.ebuild +++ b/sys-cluster/galera/galera-25.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.2 2014/10/31 20:33:34 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.5.ebuild,v 1.3 2014/10/31 22:06:10 grknight Exp $ EAPI=5 @@ -41,7 +41,7 @@ S="${WORKDIR}/${MY_P}" pkg_preinst() { if use garbd ; then enewgroup garbd - enewuser garbd + enewuser garbd -1 -1 -1 garbd fi } |