From 0fd1d0ec857e015be92913e1c2e98ac446731bf9 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 13 Mar 2012 12:56:53 +0100 Subject: [PATCH 1/2] Avoid unneeded errors deleting non existent files in install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index d5de5583f0..b36e70d26c 100755 --- a/install.sh +++ b/install.sh @@ -1453,7 +1453,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 --- From 0fbc43e0eac52c82aa181eeeb6a1addd0c8599e3 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 15 Mar 2012 12:30:12 +0100 Subject: [PATCH 2/2] Fix bad test expression in XEN shutdown script --- src/vmm_mad/remotes/xen/shutdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/xen/shutdown b/src/vmm_mad/remotes/xen/shutdown index b217235577..d7ed0a16c6 100755 --- a/src/vmm_mad/remotes/xen/shutdown +++ b/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