commit: cf0146e62e96e3be5914437c766e97418f9ff855
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 00:53:25 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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