From 6d1ce4a46a9684ac718bfc19dc8a362fbc9a9641 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 27 Jun 2011 09:02:22 -0700
Subject: remove extra stuff from clean vlans

---
 tools/clean-vlans | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/clean-vlans b/tools/clean-vlans
index 820a9dbe5..a26ad86ad 100755
--- a/tools/clean-vlans
+++ b/tools/clean-vlans
@@ -17,9 +17,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-export LC_ALL=C 
+export LC_ALL=C
 
 sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
 sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo brctl delbr foo
-sudo ifconfig -a | grep vlan | grep -v vlan124 | grep -v vlan5 | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
-sudo ifconfig -a | grep vlan | grep -v vlan124 | grep -v vlan5 | cut -f1 -d" " | xargs -n1 -ifoo vconfig rem foo
+sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
+sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo vconfig rem foo
-- 
cgit 


From 7230c384d1373e8718bc7fd2fd86b1e805a0573e Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 27 Jun 2011 09:05:05 -0700
Subject: make nova-debug work with new style instances

---
 tools/nova-debug | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/nova-debug b/tools/nova-debug
index 3ff68ca35..fd9cb054a 100755
--- a/tools/nova-debug
+++ b/tools/nova-debug
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
@@ -30,13 +29,15 @@ cd $INSTANCES_PATH/$1
 if [ $CMD != "umount" ] && [ $CMD != "launch" ]; then
 # destroy the instance
 virsh destroy $1
+virsh undefine $1
 
 # mount the filesystem
 mkdir t
-DEVICE=`losetup --show -f disk`
+DEVICE=/dev/nbd0
 echo $DEVICE
-kpartx -a $DEVICE
-mount /dev/mapper/${DEVICE:4}p1 t
+qemu-nbd -c $DEVICE disk
+sleep 3
+mount $DEVICE t
 
 fi
 if [ $CMD != "mount" ] &&  [ $CMD != "umount" ]; then
@@ -66,11 +67,13 @@ sed -i "s/<serial type=\"file\">.*<\/serial>/<serial type=\"pty\"><source path=\
 
 umount t
 
-virsh create debug.xml
+virsh define debug.xml
+virsh start $1
 virsh console $1
 virsh destroy $1
+virsh undefine $1
 
-mount /dev/mapper/${DEVICE:4}p1 t
+mount $DEVICE t
 
 # clear debug root password
 chroot t passwd -l root
@@ -83,10 +86,11 @@ if [ $CMD != "mount" ] && [ $CMD != "launch" ]; then
 
 # unmount the filesystem
 umount t
-kpartx -d $DEVICE
-losetup -d $DEVICE
+qemu-nbd -d $DEVICE
 rmdir t
 
 # recreate the instance
-virsh create libvirt.xml
+virsh define libvirt.xml
+virsh start $1
 fi
+
-- 
cgit 


From b245dfd693107318c90d1af4fdf057ea1a5fc5c2 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 27 Jun 2011 09:17:37 -0700
Subject: missed the bin line

---
 tools/nova-debug | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/nova-debug b/tools/nova-debug
index fd9cb054a..0a78af16a 100755
--- a/tools/nova-debug
+++ b/tools/nova-debug
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
-- 
cgit