Updated Branches: refs/heads/4.2 f09afea06 -> 51707d8c7
[Upgrade from 3.0.6 to 4.2][vmware] After upgrade the system vms fail to come up because "Secondary storage mount point" is pointing to a wrong location when secondary storage is mounted as read-only, changing permission of files on it will fail. But we should still stick to current mount point instread of returning a wrong mount point /mnt/sec (cherry picked from commit db2d9703c16aac0aa0ebcadaa75022981fbfe6cc) Signed-off-by: animesh <anim...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dced9723 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dced9723 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dced9723 Branch: refs/heads/4.2 Commit: dced9723ffd3c349c1ac7af7d28ff2ae6db3e922 Parents: f09afea Author: frank <frank.zh...@citrix.com> Authored: Thu Aug 29 10:29:17 2013 -0700 Committer: animesh <anim...@apache.org> Committed: Tue Sep 3 16:12:03 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dced9723/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index b5e7535..91d030b 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -767,7 +767,6 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw result = script.execute(); if (result != null) { s_logger.warn("Unable to set permissions for " + mountPoint + " due to " + result); - return null; } return mountPoint; }
