app-emulation/ganeti: fix bashisms.
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 12 Jul 2016 00:53:25 +0000 (17:53 -0700)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 12 Jul 2016 00:53:42 +0000 (17:53 -0700)
Package-Manager: portage-2.2.28

app-emulation/ganeti/files/ganeti-kvm-poweroff.initd
app-emulation/ganeti/files/ganeti.initd-r3

index 487e9e59a3f58e733dc61ceddffedd442ceade74..af25b2499b869f5c2824cdc285867df4b406bab1 100644 (file)
@@ -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
index 501563ca8795093c3f2e1fa9cda9146afc8ec4ba..a238aa1ecb84339fbbd1d6816a6747e747b84121 100644 (file)
@@ -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