You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/04/24 11:55:43 UTC
git commit: updated refs/heads/master to 39f772e
Updated Branches:
refs/heads/master 762977d7c -> 39f772eee
CLOUDSTACK-2161 updated cloud-early-config to copy iptables-* to rules.v4
In iptables-persistent, iptables-restore is loading config from the /etc/iptables/rule.v4
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/39f772ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39f772ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39f772ee
Branch: refs/heads/master
Commit: 39f772eee81863ec51fb1a2668c85e863167182f
Parents: 762977d
Author: Jayapal <ja...@citrix.com>
Authored: Wed Apr 24 12:49:59 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Wed Apr 24 15:25:15 2013 +0530
----------------------------------------------------------------------
.../debian/config/etc/init.d/cloud-early-config | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39f772ee/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index b8ddaf1..4b3cb5f 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -691,7 +691,7 @@ setup_router() {
disable_rpfilter_domR
enable_fwding 1
chkconfig nfs-common off
- cp /etc/iptables/iptables-router /etc/iptables/rules
+ cp /etc/iptables/iptables-router /etc/iptables/rules.v4
setup_sshd $ETH1_IP "eth1"
}
@@ -763,7 +763,7 @@ EOF
enable_svc cloud 0
disable_rpfilter
enable_fwding 1
- cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules
+ cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4
setup_sshd $ETH0_IP "eth0"
cp /etc/vpcdnsmasq.conf /etc/dnsmasq.conf
cp /etc/cloud-nic.rules /etc/udev/rules.d/cloud-nic.rules
@@ -789,7 +789,7 @@ setup_dhcpsrvr() {
enable_svc cloud 0
enable_fwding 0
chkconfig nfs-common off
- cp /etc/iptables/iptables-router /etc/iptables/rules
+ cp /etc/iptables/iptables-router /etc/iptables/rules.v4
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
@@ -824,7 +824,7 @@ setup_secstorage() {
[ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP
echo "$public_ip $NAME" >> /etc/hosts
- cp /etc/iptables/iptables-secstorage /etc/iptables/rules
+ cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -848,7 +848,7 @@ setup_console_proxy() {
[ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP
sed -i /gateway/d /etc/hosts
echo "$public_ip $NAME" >> /etc/hosts
- cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
+ cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
if [ "$hyp" == "vmware" ]; then
setup_sshd $ETH1_IP "eth1"
else
@@ -873,7 +873,7 @@ setup_elbvm() {
[ "$ETH2_IP" == "0.0.0.0" ] || [ "$ETH2_IP" == "" ] && public_ip=$ETH0_IP
echo "$public_ip $NAME" >> /etc/hosts
- cp /etc/iptables/iptables-elbvm /etc/iptables/rules
+ cp /etc/iptables/iptables-elbvm /etc/iptables/rules.v4
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"