diff options
| author | matt.dietz@rackspace.com <> | 2011-07-11 14:25:08 -0500 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-07-11 14:25:08 -0500 |
| commit | 559086fa3d435aeadee85d2e362d8e172b9f048e (patch) | |
| tree | cc9c0b0d9350825ade91ec142051b0aca861b02c /tools/nova-debug | |
| parent | 722cd2b16f25b334cacad4bcc9df42202ea33166 (diff) | |
| parent | 11be49aa59efc2d0d991d70546899b3625270af6 (diff) | |
| download | nova-559086fa3d435aeadee85d2e362d8e172b9f048e.tar.gz nova-559086fa3d435aeadee85d2e362d8e172b9f048e.tar.xz nova-559086fa3d435aeadee85d2e362d8e172b9f048e.zip | |
Merge from trunk
Diffstat (limited to 'tools/nova-debug')
| -rw-r--r-- | tools/nova-debug | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tools/nova-debug b/tools/nova-debug index 3ff68ca35..0a78af16a 100644 --- a/tools/nova-debug +++ b/tools/nova-debug @@ -30,13 +30,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 +68,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 +87,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 + |