From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 524A91382FE for ; Tue, 12 Jul 2016 00:53:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5985021C012; Tue, 12 Jul 2016 00:53:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E349721C012 for ; Tue, 12 Jul 2016 00:53:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50F04340D56 for ; Tue, 12 Jul 2016 00:53:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC75A243D for ; Tue, 12 Jul 2016 00:53:47 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1468284822.cf0146e62e96e3be5914437c766e97418f9ff855.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/ganeti/files/ganeti-kvm-poweroff.initd app-emulation/ganeti/files/ganeti.initd-r3 X-VCS-Directories: app-emulation/ganeti/files/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: cf0146e62e96e3be5914437c766e97418f9ff855 X-VCS-Branch: master Date: Tue, 12 Jul 2016 00:53:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aa1ccc30-861c-4a1c-a72f-f56664324010 X-Archives-Hash: c48b9f205276d6e35fa9c148895bdbc1 commit: cf0146e62e96e3be5914437c766e97418f9ff855 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Jul 12 00:53:25 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jul 12 00:53:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0146e6 app-emulation/ganeti: fix bashisms. Package-Manager: portage-2.2.28 app-emulation/ganeti/files/ganeti-kvm-poweroff.initd | 4 ++-- app-emulation/ganeti/files/ganeti.initd-r3 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd b/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd index 487e9e5..af25b24 100644 --- a/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd +++ b/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd @@ -35,7 +35,7 @@ stop() { break fi - echo -n "." + printf "." for vm_monitor in $(find $CONTROL_PATH -type s -name '*.monitor') ; do if ! echo | socat -U UNIX:$vm_monitor STDIO > /dev/null 2>&1; then rm -rf $vm_monitor @@ -43,7 +43,7 @@ stop() { done sleep 5 - let remaining-=5 1 + remaining=$((remaining - 5)) done if [ -n "$(find $CONTROL_PATH -type s -name '*.monitor')" ] ; then diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3 index 501563c..a238aa1 100644 --- a/app-emulation/ganeti/files/ganeti.initd-r3 +++ b/app-emulation/ganeti/files/ganeti.initd-r3 @@ -29,13 +29,13 @@ start() { local daemon retval=0 optsvar started_daemons daemon_opts for daemon in $(${DAEMON_UTIL} list-start-daemons); do - optsvar="${daemon//-/_}" + optsvar="$(printf "${daemon}_OPTS" | tr - _ | LC_ALL=C tr '[:lower:]' '[:upper:]')" case "${daemon#ganeti-}" in masterd|rapi|luxid) is_master || continue;; esac - eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\" + eval daemon_opts=\"\$\{${optsvar}\}\" ebegin "Starting ${daemon}" eindent