Handle rmdir errors

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/unraise.sh b/unraise.sh
index f9738460adbb9d6445bddf98d904a6d32a3a5450..6c7b8dec3df17ff9132e226f332d14547adc339c 100644 (file)
--- a/unraise.sh
+++ b/unraise.sh
@@ -12,7 +12,7 @@ for_each_component unconfigure
 
 for i in `cat /var/log/raisin.log 2>/dev/null`
 do
-    if test -f /"$i"
+    if test ! -d /"$i"
     then
         rm -f /"$i"
     fi
@@ -21,7 +21,7 @@ for i in `cat /var/log/raisin.log 2>/dev/null`
 do
     if test -d /"$i"
     then
-        rmdir --ignore-fail-on-non-empty /"$i"
+        rmdir --ignore-fail-on-non-empty /"$i" &> /dev/null || true
     fi
 done