From b891561d969583145d73af913b193cd2d9d4c192 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 11 Jan 2012 12:58:03 +0100 Subject: [PATCH 1/2] feature #1020: VMware networking traditional method also supported (dummy drivers) --- src/vmm/LibVirtDriverVMware.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc index 7069d9b882..8a0363da9f 100644 --- a/src/vmm/LibVirtDriverVMware.cc +++ b/src/vmm/LibVirtDriverVMware.cc @@ -319,8 +319,15 @@ int LibVirtDriver::deployment_description_vmware( script = nic->vector_value("SCRIPT"); model = nic->vector_value("MODEL"); - bridge = "one-pg-"; - bridge.append(network_id); + if (vm->get_vnm_mad() == LibVirtDriver::vmware_vnm_name) + { + bridge = "one-pg-"; + bridge.append(network_id); + } + else + { + bridge = nic->vector_value("BRIDGE"); + } file << "\t\t" << endl; file << "\t\t\t" << endl; From 9b9aed19f90d44698d17888e2a6ab5014be0f163 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 11 Jan 2012 13:14:36 +0100 Subject: [PATCH 2/2] bug #1042: use stat when the image is not a dir --- src/image_mad/remotes/fs/fsrc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/image_mad/remotes/fs/fsrc b/src/image_mad/remotes/fs/fsrc index 76237328c5..f8ee609f26 100644 --- a/src/image_mad/remotes/fs/fsrc +++ b/src/image_mad/remotes/fs/fsrc @@ -64,9 +64,15 @@ echo "$IMAGE_REPOSITORY_PATH/`echo $CANONICAL_MD5 | cut -d ' ' -f1`" } function fs_du { - SIZE=`du -sk "$1" | cut -f1` + if [ -d "$1" ]; then + SIZE=`du -s "$1" | cut -f1` + error=$? + else + SIZE=`stat -c %s "$1"` + error=$? + fi - if [ $? -ne 0 ]; then + if [ $error -ne 0 ]; then SIZE=0 else SIZE=$(($SIZE/1024))