You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/23 13:28:14 UTC
git commit: updated refs/heads/4.3 to 853ec38
Repository: cloudstack
Updated Branches:
refs/heads/4.3 063bb8f5b -> 853ec38b0
CLOUDSTACK-7517: loading ftp modules in VR
(cherry picked from commit b4f03a1339c67438a2a9cf94dd81b98cdfb458b9)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/853ec38b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/853ec38b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/853ec38b
Branch: refs/heads/4.3
Commit: 853ec38b06ae18d97701574212fd68c17bafb489
Parents: 063bb8f
Author: Jayapal <ja...@apache.org>
Authored: Wed Sep 10 14:10:02 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Sep 23 13:27:27 2014 +0200
----------------------------------------------------------------------
.../patches/debian/config/etc/init.d/cloud-early-config | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/853ec38b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 9152df2..92290c4 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -873,6 +873,7 @@ setup_redundant_router() {
then
(crontab -l; echo -e "SHELL=/bin/bash\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n*/1 * * * * $rrouter_bin_path/check_heartbeat.sh 2>&1 > /dev/null") | crontab
fi
+ load_modules
}
setup_aesni() {
@@ -882,6 +883,13 @@ setup_aesni() {
fi
}
+load_modules() {
+
+ #load nf modules for ftp
+ modprobe nf_nat_ftp
+ modprobe nf_conntrack_ftp
+}
+
setup_router() {
log_it "Setting up virtual router system vm"
@@ -953,6 +961,7 @@ setup_router() {
#for old templates
cp /etc/iptables/iptables-router /etc/iptables/rules
setup_sshd $ETH1_IP "eth1"
+ load_modules
}
@@ -1052,6 +1061,7 @@ EOF
else
echo 0 > /var/cache/cloud/dnsmasq_managed_lease
fi
+ load_modules
}