Updated Branches: refs/heads/4.1 a139c46a3 -> 7ab518012 refs/heads/4.2-forward af2646f9a -> 39f7ddbb8 refs/heads/master 59c6fb7ff -> 2b4e994a4
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/39f7ddbb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39f7ddbb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39f7ddbb Branch: refs/heads/4.2-forward Commit: 39f7ddbb8f7eedb050da2991cdc1fb72a9e97f5f Parents: af2646f Author: Marcus Sorensen <[email protected]> Authored: Tue Sep 17 10:52:04 2013 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Tue Sep 17 10:52:04 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/39f7ddbb/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 42d9084..51e3363 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 @@ -154,7 +154,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 {
