cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [2/3] git commit: updated refs/heads/master to 2b4e994
Date Tue, 17 Sep 2013 16:54:23 GMT
CLOUDSTACK-3565 - fix for new libvirt behavior when defining NFS
pools that are already mounted in KVM hypervisor


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b4e994a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b4e994a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b4e994a

Branch: refs/heads/master
Commit: 2b4e994a4dcde3944b7224d12ad2d992eec938c2
Parents: 59c6fb7
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Sep 17 10:52:04 2013 -0600
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Tue Sep 17 10:53:35 2013 -0600

----------------------------------------------------------------------
 .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b4e994a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 719a03d..5760725 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -148,7 +148,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
             // if error is that pool is mounted, try to handle it
             if (e.toString().contains("already mounted")) {
                 s_logger.error("Attempting to unmount old mount libvirt is unaware of at
"+targetPath);
-                String result = Script.runSimpleBashScript("umount " + targetPath );
+                String result = Script.runSimpleBashScript("umount -l " + targetPath );
                 if (result == null) {
                     s_logger.error("Succeeded in unmounting " + targetPath);
                     try {


Mime
View raw message