From 1ff7a147bd267d0b9221a8070e47b6a84cafd56d Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Thu, 17 Jan 2013 11:17:43 -0700 Subject: [PATCH] Revert "Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn" This reverts commit 1a2e69fb22a64b84960860965d4f757637ac5e12. accidentally pushed mode change of sh file as well, need to split this out --- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 +- scripts/storage/qcow2/resizevolume.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 scripts/storage/qcow2/resizevolume.sh diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 18a0426e2fa..2dc7950b2b7 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -720,7 +720,7 @@ public class VirtualRoutingResource implements Manager { args += " -N "; args += cmd.getPeerGuestCidrList(); } - String result = routerProxy("ipsectunnel.sh", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args); + String result = routerProxy("ipsectunnel", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args); if (result != null) { return new Answer(cmd, false, "Configure site to site VPN failed due to " + result); } diff --git a/scripts/storage/qcow2/resizevolume.sh b/scripts/storage/qcow2/resizevolume.sh old mode 100755 new mode 100644