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/7ab51801 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ab51801 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ab51801 Branch: refs/heads/4.1 Commit: 7ab5180120650bb4d5ffdf69d4cec5f3debea48d Parents: a139c46 Author: Marcus Sorensen <[email protected]> Authored: Tue Sep 17 10:52:04 2013 -0600 Committer: Marcus Sorensen <[email protected]> Committed: Tue Sep 17 10:54:03 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/7ab51801/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 9f85132..2892360 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 @@ -127,7 +127,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 {
