sredjene skripte za ciscenje nakon pucanja imunes skripte, pozivati sa sudo ./cleanup

diff --git a/bridge_cleanup.sh b/bridge_cleanup.sh
index a497bd5ae96b84d07fdcf22210e24a18ccdeb6ec..2ae6f5f273b4ec409f097c363ae7e4cdfa46e3da 100755 (executable)
--- 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 (executable)
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 3d9a555f7fee1287cf55a0a6e1157e4597ebd53d..6699922323e1042f1958e2432491d79d600246d7 100755 (executable)
--- 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."