summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/ganeti')
-rw-r--r--app-emulation/ganeti/files/ganeti-kvm-poweroff.initd4
-rw-r--r--app-emulation/ganeti/files/ganeti.initd-r34
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 487e9e59a3f5..af25b2499b86 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 501563ca8795..a238aa1ecb84 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