| 1 |
commit: cf0146e62e96e3be5914437c766e97418f9ff855 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 00:53:25 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 00:53:42 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0146e6 |
| 7 |
|
| 8 |
app-emulation/ganeti: fix bashisms. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-emulation/ganeti/files/ganeti-kvm-poweroff.initd | 4 ++-- |
| 13 |
app-emulation/ganeti/files/ganeti.initd-r3 | 4 ++-- |
| 14 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd b/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd |
| 17 |
index 487e9e5..af25b24 100644 |
| 18 |
--- a/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd |
| 19 |
+++ b/app-emulation/ganeti/files/ganeti-kvm-poweroff.initd |
| 20 |
@@ -35,7 +35,7 @@ stop() { |
| 21 |
break |
| 22 |
fi |
| 23 |
|
| 24 |
- echo -n "." |
| 25 |
+ printf "." |
| 26 |
for vm_monitor in $(find $CONTROL_PATH -type s -name '*.monitor') ; do |
| 27 |
if ! echo | socat -U UNIX:$vm_monitor STDIO > /dev/null 2>&1; then |
| 28 |
rm -rf $vm_monitor |
| 29 |
@@ -43,7 +43,7 @@ stop() { |
| 30 |
done |
| 31 |
|
| 32 |
sleep 5 |
| 33 |
- let remaining-=5 1 |
| 34 |
+ remaining=$((remaining - 5)) |
| 35 |
done |
| 36 |
|
| 37 |
if [ -n "$(find $CONTROL_PATH -type s -name '*.monitor')" ] ; then |
| 38 |
|
| 39 |
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3 |
| 40 |
index 501563c..a238aa1 100644 |
| 41 |
--- a/app-emulation/ganeti/files/ganeti.initd-r3 |
| 42 |
+++ b/app-emulation/ganeti/files/ganeti.initd-r3 |
| 43 |
@@ -29,13 +29,13 @@ start() { |
| 44 |
local daemon retval=0 optsvar started_daemons daemon_opts |
| 45 |
|
| 46 |
for daemon in $(${DAEMON_UTIL} list-start-daemons); do |
| 47 |
- optsvar="${daemon//-/_}" |
| 48 |
+ optsvar="$(printf "${daemon}_OPTS" | tr - _ | LC_ALL=C tr '[:lower:]' '[:upper:]')" |
| 49 |
|
| 50 |
case "${daemon#ganeti-}" in |
| 51 |
masterd|rapi|luxid) is_master || continue;; |
| 52 |
esac |
| 53 |
|
| 54 |
- eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\" |
| 55 |
+ eval daemon_opts=\"\$\{${optsvar}\}\" |
| 56 |
|
| 57 |
ebegin "Starting ${daemon}" |
| 58 |
eindent |
Archives