From 4295c0a883e01d2e7f4fc0419262eb5169c7b82b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kosta=20Pribi=C4=87?= <kosta.pribic@gmail.com>
Date: Wed, 9 Sep 2009 12:45:44 +0200
Subject: [PATCH] sredjene skripte za ciscenje nakon pucanja imunes skripte,
 pozivati sa sudo ./cleanup

---
 bridge_cleanup.sh | 11 +++++++----
 cleanup           |  9 +++++++++
 stopvz.sh         | 17 ++++++++++-------
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100755 cleanup

diff --git a/bridge_cleanup.sh b/bridge_cleanup.sh
index a497bd5..2ae6f5f 100755
--- a/bridge_cleanup.sh
+++ b/bridge_cleanup.sh
@@ -2,12 +2,15 @@
 
 # TODO: ili prepisatu u tcl ili korigirati tako da ignorira prvi red
 
-BRIDGES=`brctl show | awk '{print $1}'`
+echo "\nBridge cleanup..."
+
+BRIDGES=`brctl show | grep -v interfaces | awk '{print $1}'`
+broj=`brctl show | grep -v -c interfaces`
+echo "  #Bridges: $broj"
 
-echo "  Krece brisanje mostova..."
 for bridge in $BRIDGES; do 
-    echo "      Brisem \"$bridge\" ..."
+    echo "  Cleaning \"$bridge\" ..."
 	sudo ifconfig $bridge down; 
 	sudo brctl delbr $bridge; 
 done
-echo "  Gotovo brisanje mostova..."
+echo "  Done."
diff --git a/cleanup b/cleanup
new file mode 100755
index 0000000..a9d9b84
--- /dev/null
+++ b/cleanup
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+sudo ./stopvz.sh
+sudo ./bridge_cleanup.sh
+echo "\n==========================\n"
+echo "Listing active VEs  (sudo vzlist)\n"
+sudo vzlist
+echo "\nListing active bridges (sudo brctl show)\n"
+sudo brctl show
diff --git a/stopvz.sh b/stopvz.sh
index 3d9a555..6699922 100755
--- a/stopvz.sh
+++ b/stopvz.sh
@@ -1,11 +1,14 @@
 #!/bin/sh
-BROJ=`sudo vzlist | grep -c -v VEID`
+echo "\nVE Cleanup."
 
-echo "Broj VE-ova: $BROJ"
-BROJ=$(expr $BROJ - 1)
+VEs=`sudo vzlist | grep -v VEID | awk '{print $1}'`
+broj=`sudo vzlist | grep -v -c VEID`
 
-for i in $(seq 0 1 $BROJ); do 
-	echo "\nGasim n$i...";
-	sudo vzctl stop n$i; 
-	sudo vzctl destroy n$i; 
+echo "  #VEs: $broj"
+
+for i in $VEs; do 
+	echo "  Shutting down $i";
+	sudo vzctl stop $i; 
+	sudo vzctl destroy $i; 
 done
+echo "  Done."
-- 
2.39.5