etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CS-15511: Fix parameter transfer in bash

This commit is contained in:
Sheng Yang 2012-07-18 12:26:24 -07:00
parent 46d80f6e90
commit 664c8b3b2c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -559,13 +559,13 @@ public class VirtualRoutingResource implements Manager {
args += " -N ";
args += cmd.getPeerGuestCidrList();
args += " -e ";
args += cmd.getEspPolicy();
args += "\"" + cmd.getEspPolicy() + "\"";
args += " -i ";
args += cmd.getIkePolicy();
args += "\"" + cmd.getIkePolicy() + "\"";
args += " -t ";
args += Long.toString(cmd.getLifetime());
args += " -s ";
args += cmd.getIpsecPsk();
args += "\"" + cmd.getIpsecPsk() + "\"";
} else {
args = "-D";
args += " -r ";

6
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -1024,13 +1024,13 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
args += " -N ";
args += cmd.getPeerGuestCidrList();
args += " -e ";
args += cmd.getEspPolicy();
args += "\"" + cmd.getEspPolicy() + "\"";
args += " -i ";
args += cmd.getIkePolicy();
args += "\"" + cmd.getIkePolicy() + "\"";
args += " -t ";
args += Long.toString(cmd.getLifetime());
args += " -s ";
args += cmd.getIpsecPsk();
args += "\"" + cmd.getIpsecPsk() + "\"";
} else {
args += " -D";
args += " -r ";

6
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -7360,13 +7360,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
args += " -N ";
args += cmd.getPeerGuestCidrList();
args += " -e ";
args += cmd.getEspPolicy();
args += "\"" + cmd.getEspPolicy() + "\"";
args += " -i ";
args += cmd.getIkePolicy();
args += "\"" + cmd.getIkePolicy() + "\"";
args += " -t ";
args += Long.toString(cmd.getLifetime());
args += " -s ";
args += cmd.getIpsecPsk();
args += "\"" + cmd.getIpsecPsk() + "\"";
} else {
args += " -D";
args += " -r ";

2
patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh
View File

@ -190,6 +190,8 @@ do
esac
done
logger -t cloud "$(basename $0): parameters $*"
# get interface for public ip
ip link|grep BROADCAST|grep -v eth0|cut -d ":" -f 2 > /tmp/iflist
while read i