From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 28 Jan 2014 09:12:38 +0000 (+0100)
Subject: disable nightly-clean-trash for now
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fd1fb69c2bd29868dccb1799dd62a37dc9a634d0;p=infrastructure.git

disable nightly-clean-trash for now
---

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index 026d019..91d332b 100755
--- a/scripts/nightly-clean-trash.sh
+++ b/scripts/nightly-clean-trash.sh
@@ -3,6 +3,11 @@
 # -mtime +1 : older than one day
 # grep -v : preserve the top directory
 
+# this script is obsolete
+# as it is still mentioned in our build boxes crontabs we keep it alive for now
+
+exit 0
+
 exec >> /root/.nightly-clean-trash.log
 exec 2>&1
 
@@ -19,11 +24,12 @@ potential_vservers=$(find /build/trash -maxdepth 1 -type d -print 2> /dev/null |
     vname=$(basename $vname .log.txt)
     vname=$(basename $vname .timestamp)
     if [ -d /vservers/$vname ] ; then
-	vserver --silent $vname delete
+	virsh -c lxc:/// destroy $vname >$ /dev/null && echo $vname destroyed
+	virsh -c lxc:/// undefine $vname >$ /dev/null && echo $vname undefined
 	rm -f /vservers/${vname}.log.txt
 	rm -f /vservers/${vname}.timestamp
     fi
-done &> /dev/null
+done
 
 echo $todelete | xargs rm -rf