Merge branch 'feature-1112' of git.opennebula.org:one into feature-1112

install.sh

@@ -1468,7 +1468,7 @@ if [ "$UNINSTALL" = "no" ] ; then
     done
 
     # Remove old migrators
-    rm $LIB_LOCATION/ruby/onedb/*.rb
+    rm $LIB_LOCATION/ruby/onedb/*.rb &> /dev/null
 fi
 
 # --- Install/Uninstall files ---

src/vmm_mad/remotes/xen/shutdown

@@ -30,7 +30,7 @@ exec_and_log "$XM_SHUTDOWN $deploy_id" \
 
 OUT=$(gdm)
 
-while [ -n "$OUT" -a $(echo $OUT | awk '{print $5}') != "---s--" ]; do
+while [ -n "$OUT" -a "$(echo $OUT | awk '{print $5}')" != "---s--" ]; do
     sleep 1
     OUT=$(gdm)
 done